[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1841471-close-dropdowns-with-parent-windows into lp:widelands
Continuous integration builds have changed state: Travis build 5358. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/578358022. Appveyor build 5128. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1841471_close_dropdowns_with_parent_windows-5128. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1841471-close-dropdowns-with-parent-windows/+merge/371999 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1841471-close-dropdowns-with-parent-windows into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_ga_unittests into lp:widelands
Continuous integration builds have changed state: Travis build 5363. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/578959736. Appveyor build 5133. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_ga_unittests-5133. -- https://code.launchpad.net/~widelands-dev/widelands/ai_ga_unittests/+merge/372091 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_ga_unittests into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler-warnings-201908 into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/compiler-warnings-201908 into lp:widelands.
Commit message:
Fix compiler warnings.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/compiler-warnings-201908/+merge/372109
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/compiler-warnings-201908 into lp:widelands.
=== modified file 'src/wlapplication_options.cc'
--- src/wlapplication_options.cc 2019-08-28 06:12:07 +
+++ src/wlapplication_options.cc 2019-08-31 03:27:07 +
@@ -25,7 +25,7 @@
#include "logic/filesystem_constants.h"
#include "wlapplication.h"
-Profile g_options(Profile::err_log);
+static Profile g_options(Profile::err_log);
void check_config_used() {
g_options.check_used();
=== modified file 'src/wui/constructionsitewindow.cc'
--- src/wui/constructionsitewindow.cc 2019-07-11 08:38:29 +
+++ src/wui/constructionsitewindow.cc 2019-08-31 03:27:07 +
@@ -30,10 +30,6 @@
static const char pic_tab_settings[] = "images/wui/menus/statistics_stock.png";
static const char pic_tab_settings_wares[] = "images/wui/stats/menu_tab_wares_warehouse.png";
static const char pic_tab_settings_workers[] = "images/wui/stats/menu_tab_workers_warehouse.png";
-static const char pic_max_fill_indicator[] = "images/wui/buildings/max_fill_indicator.png";
-static const char pic_priority_low[] = "images/wui/buildings/low_priority_button.png";
-static const char pic_priority_normal[] = "images/wui/buildings/normal_priority_button.png";
-static const char pic_priority_high[] = "images/wui/buildings/high_priority_button.png";
static const char pic_stock_policy_prefer[] = "images/wui/buildings/stock_policy_prefer.png";
static const char pic_stock_policy_dontstock[] = "images/wui/buildings/stock_policy_dontstock.png";
static const char pic_stock_policy_remove[] = "images/wui/buildings/stock_policy_remove.png";
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/spritesheet_generation into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/spritesheet_generation into lp:widelands has been updated. Description changed to: Spritesheets :) Note that the idle carrier gets a black background when zoomed out - this is a proof-of-concept that the correct mipmap files are being generated and used. The files at 0.5 scale can be deleted before merging. Once this is in, we should look at exporting all 4 scales directly from Blender for maximum quality. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/spritesheet_generation/+merge/370824 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/spritesheet_generation into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_wai_files_29082019 into lp:widelands
Continuous integration builds have changed state: Travis build 5362. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/578917768. Appveyor build 5132. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_wai_files_29082019-5132. -- https://code.launchpad.net/~widelands-dev/widelands/ai_wai_files_29082019/+merge/372083 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_wai_files_29082019 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/amazons-coding-changes into lp:widelands
Review: Needs Fixing playtest I confirmed the critical behaviour (not having the build menu with buildcaps already have a flg build) is not in trunk so this needs fixing -- https://code.launchpad.net/~widelands-dev/widelands/amazons-coding-changes/+merge/371725 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/amazons-coding-changes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_ga_unittests into lp:widelands
TiborB has proposed merging lp:~widelands-dev/widelands/ai_ga_unittests into
lp:widelands.
Commit message:
Handful of AI unittests
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ai_ga_unittests/+merge/372091
Without effect on the game itself
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/ai_ga_unittests into lp:widelands.
=== modified file 'src/ai/test/CMakeLists.txt'
--- src/ai/test/CMakeLists.txt 2019-07-11 18:33:59 +
+++ src/ai/test/CMakeLists.txt 2019-08-30 19:03:54 +
@@ -2,6 +2,7 @@
SRCS
ai_test_main.cc
test_ai.cc
+test_ga.cc
DEPENDS
base_log
base_macros
=== modified file 'src/ai/test/test_ai.cc'
--- src/ai/test/test_ai.cc 2019-08-02 09:54:55 +
+++ src/ai/test/test_ai.cc 2019-08-30 19:03:54 +
@@ -36,7 +36,7 @@
using namespace Widelands;
-BOOST_AUTO_TEST_SUITE(ai)
+BOOST_AUTO_TEST_SUITE(warehouse_distance)
BOOST_AUTO_TEST_CASE(flag_distance_soft_expiry) {
FlagWarehouseDistances fw;
=== added file 'src/ai/test/test_ga.cc'
--- src/ai/test/test_ga.cc 1970-01-01 00:00:00 +
+++ src/ai/test/test_ga.cc 2019-08-30 19:03:54 +
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2007-2019 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include
+
+#include
+
+#ifdef _WIN32
+#include "base/log.h"
+#endif
+#include "ai/ai_help_structs.h"
+#include "base/macros.h"
+
+// Triggered by BOOST_AUTO_TEST_CASE
+CLANG_DIAG_OFF("-Wdisabled-macro-expansion")
+
+namespace Widelands { // Needed?
+class World;
+} // namespace Widelands
+
+using namespace Widelands;
+
+BOOST_AUTO_TEST_SUITE(ai_ga)
+
+BOOST_AUTO_TEST_CASE(neuron) {
+ //weight(w), type(f), id(i)
+ Neuron n1 = Neuron(-50, 0, 0);
+ BOOST_CHECK_EQUAL(n1.get_id(), 0);
+ BOOST_CHECK_EQUAL(n1.get_weight(), -50);
+ BOOST_CHECK_EQUAL(n1.get_result(10), -25);
+ BOOST_CHECK_EQUAL(n1.get_result(20), -50);
+ BOOST_CHECK_EQUAL(n1.get_result_safe(100), -50);
+}
+
+BOOST_AUTO_TEST_CASE(neuron_updated_weight) {
+ //weight(w), type(f), id(i)
+ Neuron n1 = Neuron(-50, 0, 0);
+ n1.set_weight(50);
+ n1.recalculate();
+ BOOST_CHECK_EQUAL(n1.get_id(), 0);
+ BOOST_CHECK_EQUAL(n1.get_weight(), 50);
+ BOOST_CHECK_EQUAL(n1.get_result(10), 25);
+ BOOST_CHECK_EQUAL(n1.get_result_safe(100), 50);
+}
+
+BOOST_AUTO_TEST_CASE(fneuron_position) {
+ //core(c), id(i)
+ FNeuron fn = FNeuron(0, 0);
+ BOOST_CHECK_EQUAL(fn.get_int(), 0); // Initialized as 0, so must be still 0
+ const bool val0 = fn.get_position(0);
+ const bool val1 = fn.get_position(1);
+ BOOST_CHECK_EQUAL(fn.get_position(0), val0);
+ fn.flip_bit(0);
+ BOOST_CHECK_EQUAL(!fn.get_position(0), val0);
+ BOOST_CHECK_EQUAL(fn.get_position(1), val1); //should not be changed
+ BOOST_CHECK(fn.get_int() != 0); // Initialized as 0, so now must be different
+ fn.flip_bit(0); // reverting back
+ BOOST_CHECK_EQUAL(fn.get_int(), 0);
+}
+
+
+BOOST_AUTO_TEST_SUITE_END()
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/new-shipping into lp:widelands
I now got Assertion failed: (ship.get_nritems() == 0), function ship_arrived, file ../src/economy/portdock.cc, line 383. after ./widelands --loadgame=~/Downloads/ShipCrash5.wgf Somwhat after 1:56... from https://www.magentacloud.de/share/tu4ayusx.k Do frisians have very special wares? -- https://code.launchpad.net/~widelands-dev/widelands/new-shipping/+merge/371155 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new-shipping. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_wai_files_29082019 into lp:widelands
TiborB has proposed merging lp:~widelands-dev/widelands/ai_wai_files_29082019 into lp:widelands. Commit message: New AI numbers - results of training.. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_wai_files_29082019/+merge/372083 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_wai_files_29082019 into lp:widelands. === modified file 'data/ai/ai_input_1.wai' --- data/ai/ai_input_1.wai 2019-08-11 15:36:53 + +++ data/ai/ai_input_1.wai 2019-08-30 17:18:02 + @@ -2,297 +2,297 @@ # See wiki for more info: https://wl.widelands.org/wiki/Ai%20Training/ [magic_numbers] -0="80" -1="-12" +0="-87" +1="27" 2="0" -3="-66" -4="-86" +3="-57" +4="-42" 5="47" -6="-98" -7="-69" -8="-79" +6="-36" +7="-98" +8="-91" 9="17" -10="-56" +10="-30" 11="95" -12="64" +12="98" 13="59" -14="-42" -15="-82" +14="-16" +15="-94" 16="8" 17="-7" 18="-58" 19="14" -20="93" -21="0" -22="33" -23="-44" +20="-69" +21="40" +22="-70" +23="46" 24="60" -25="-13" -26="31" +25="0" +26="37" 27="28" -28="-24" -29="79" -30="-91" +28="-51" +29="-51" +30="28" 31="-33" 32="40" 33="-36" -34="8" -35="45" -36="25" +34="-13" +35="61" +36="0" 37="-16" 38="32" -39="-17" -40="-86" -41="-1" -42="-82" +39="0" +40="31" +41="48" +42="-83" 43="41" -44="5" -45="44" -46="-17" -47="-57" -48="35" -49="9" +44="-34" +45="52" +46="-24" +47="21" +48="69" +49="-37" 50="39" -51="-65" -52="97" +51="69" +52="23" 53="39" -54="-9" -55="-28" -56="30" -57="63" -58="-10" -59="57" -60="-38" -61="-36" -62="5" -63="75" -64="-7" -65="-13" +54="-84" +55="-61" +56="98" +57="84" +58="32" +59="-72" +60="61" +61="36" +62="21" +63="-89" +64="-9" +65="-9" 66="37" -67="-32" +67="39" 68="86" 69="-71" -70="-68" -71="-82" -72="-96" -73="-4" -74="-71" -75="-83" -76="-92" -77="52" +70="80" +71="22" +72="40" +73="-14" +74="76" +75="-71" +76="-48" +77="96" 78="55" -79="-31" -80="-1" -81="-65" -82="-2" -83="75" -84="-80" -85="51" -86="72" -87="-3" -88="-12" -89="0" -90="-46" -91="-90" -92="82" -93="-5" -94="44" -95="-57" -96="46" -97="-32" +79="-15" +80="-41" +81="2" +82="-100" +83="-89" +84="11" +85="-49" +86="19" +87="84" +88="21" +89="15" +90="-91" +91="-32" +92="-8" +93="-52" +94="3" +95="-35" +96="57" +97="-60" 98="-32" 99="77" 100="40" -101="-65" -102="34" -103="67" -104="-53" -105="95" +101="-95" +102="62" +103="10" +104="27" +105="63" 106="-67" -107="85" -108="71" -109="-8" -110="85" +107="-79" +108="68" +109="90" +110="-41" 111="-99" -112="40" +112="25" 113="-62" -114="21" +114="-38" 115="78" -116="5" -117="-81" -118="-83" -119="-45" -120="6" -121="-52" +116="-82" +117="36" +118="-69" +119="-61" +120="-49" +121="-20" 122="-8" -123="-94" -124="-45" -125="33" +123="-26" +124="-53" +125="100" 126="48" -127="58" -128="-68" -129="36" -130="-80" -131="-93" -132="84" +127="34" +128="-76" +129="81" +130="-60" +131="-7" +132="83" 133="-77" 134="-89" 135="-77" -136="-92" -137="66" +136="3" +137="-8" 138="-33" -139="38" +139="89" 140="-75" 141="80" -142="0" -143="-39" -144="79" -145="-95" -146="-72" -147="69" -148="-97" -149="71" -150="-87" +142="43" +143="68" +144="86" +145="-57" +146="-35" +147="67" +148="-71" +149="64" +150="-31" 151="47" -152="-69" -153="57" -154="-17" -155="-24" -156="-78" +152="-73" +153="87" +154="-67" +155="52" +156="-70" 157="46" -158="48" +158="43" 159="89" -160="-1" +160="49" 161="79" -162="30" -163="19" -164="-6" -165="23" -166="38" -167="-72" -168="-19" +162="80" +163="76" +164="-57" +165="-99" +166="-26" +167="91" +168="-100" 169="52" 170="12" -171="80" -172="5" +171="84" +172="48" 173="-51" 174="-98" -175="-94" -176="48" -177="4" -178="-65" +175="-53" +176="-11" +177="61" +178="-31" 179="-29" -180="87" +180="-44" 181="47" 182="-34" 183="0" -184="26" -185="-76" +184="59" +185="-74" 186="32" -187="60" -188="42" -189="57" -190="-26" -191="34" -192="53" -193="13" -194="62" -195="42" -196="-75" -197="56" +187="28" +188="-4" +189="-57" +190="80" +191="-96" +192="-57" +193="42" +194="86" +195="3" +196="0" +197="-1" 198="63" -199="22" +199="28" [neuron_values] 0="40" 1="39" 2="69" -3="68" +3="-22" 4="35" -5="-97" +5="-45" 6="29" 7="31" 8="97" -9="-81" +9="95" 10="-78" 11="45" -12="-16" +12="22" 13="53" -14="-98" -15="-84" +14="5" +15="94" 16="36" -17="-43" +17="-39" 18="14" -19="14" -20="33" -21="-69" +19="-25" +20="-73" +21="-12" 22="-85" 23="68" 24="-50" 25="57" -26="-100" -27="-99" +26="-44" +27="-100" 28="21" -29="-78" +29="53" 30="-60" -31="-93" -32="-26" -33="54" -34="-47" +31="61" +32="39" +33="52" +34="-64" 35="-20" 36="-91" -37="6" -38="5" -39="-60" -40="47" +37="-95" +38="36" +39="-36" +40="-68" 41="0" -42="0" -43="0" -44="-73" -45="44" -46="62" -47="-43" -48="0" -49="45" -50="-23" -51="3" -52="90" -53="-82" -54="47" -55="15" -56="18" -57="-86" +42="-19" +43="-63" +44="-35" +45="30" +46="96" +47="-67" +48="7" +49="-69" +50="-13"
