[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-20 Thread bunnybot
Continuous integration builds have changed state: Travis build 4501. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/496123226. Appveyor build 4288. State: success. Details:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/robust-file-saving into lp:widelands

2019-02-20 Thread bunnybot
Continuous integration builds have changed state: Travis build 4498. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/495915762. Appveyor build 4285. State: success. Details:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-20 Thread Toni Förster
New calculations are up: https://fosuta.org/pics/Territorial_Times_v4.ods We are at least 50% faster in general. The fields are almost the same. Green Cells have 20 or less fields difference. Yellow 50. And red more than 50 (but these are only two maps). --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-20 Thread hessenfarmer
I am on a business trip until Friday so I can't do much other than check this side. @Toni: In principle you are right in perhaps98% of the maps but there are cornercases where you might miss a special building spot which is needed to reach a somewhat hidden valley or a big mountain. So I

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-20 Thread Toni Förster
I pushed my tweak as revision 8986. I'm currently do some testing with all the maps and it looks promising. Will post an updated list later on. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1810062-territorial-calculations/+merge/361366 Your team Widelands Developers is subscribed

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-20 Thread Toni Förster
I think a found a good tweak. The main problem is the second for loop: for idx, fg in ipairs(radius) do Here we iterate through fields too many times. On a small map some million times. I got Astoria 2.R down from 58 seconds to 23seconds. On some maps the calculated area is a little

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-20 Thread GunChleoc
Forget my last code tweak comment, I needed to look at this with code highlighting. I have done some small tweaks to the code. We should definitely stick this in a coroutine, because my screen will go black for a bit on Wide World, and my machine is fast. --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-20 Thread Toni Förster
I guess the difference in size for some maps between 8975 and 8978 is the way port spaces are evaluated. That is the main difference between the 2 revisions. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1810062-territorial-calculations/+merge/361366 Your team Widelands Developers

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-20 Thread Toni Förster
@hessenfarmer You're welcome. :D https://fosuta.org/pics/Territorial_Times_trunk_r8975_r8978.ods BTW. We shouldn't let us fool by the numbers, because they say nothing about the "quality" of the calculated fields. The fields calculated with r8978 are accurate while the ones in trunk are not.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-20 Thread hessenfarmer
Update: I continued to playtest trident of fire and I saw a volcano eruption and saw it vanish again. So I assume the script still works with the new hash value -- https://code.launchpad.net/~widelands-dev/widelands/bug-1810062-territorial-calculations/+merge/361366 Your team Widelands