updated version number

AECP-ETHZ · Oct 2, 2018 · bbf9d93 · bbf9d93
1 parent fa807a3
commit bbf9d93
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 18 deletions.
diff --git a/ABM.log.1 b/ABM.log.1
@@ -1,8 +1,28 @@
-Oct 02, 2018 12:36:05 PM main.Consumat main
+Oct 02, 2018 12:39:08 PM main.Consumat main
 INFO: Starting FARMIND: version number: 0.8.6
-Oct 02, 2018 12:36:05 PM main.Consumat main
+Oct 02, 2018 12:39:08 PM main.Consumat main
 INFO: Year 1 simulation started
-Oct 02, 2018 12:36:05 PM mathematical_programming.SwissLand runModel
+Oct 02, 2018 12:39:09 PM mathematical_programming.SwissLand runModel
 INFO: Starting MP model
-Oct 02, 2018 12:36:05 PM mathematical_programming.SwissLand runModel
+Oct 02, 2018 12:39:09 PM mathematical_programming.SwissLand runModel
 INFO: Waiting for output generated by MP model
+Oct 02, 2018 12:39:10 PM main.Consumat main
+INFO: Year 1 simulation finished
+Oct 02, 2018 12:39:10 PM main.Consumat main
+INFO: Year 2 simulation started
+Oct 02, 2018 12:39:10 PM agent.Farm decideActivitySet
+FINE: Opt-out made: 1 for farm 10110
+Oct 02, 2018 12:39:10 PM agent.Farm decideActivitySet
+FINE: Opt-out made: 1 for farm 10290
+Oct 02, 2018 12:39:10 PM agent.Farm decideActivitySet
+FINE: Opt-out made: 1 for farm 10310
+Oct 02, 2018 12:39:10 PM agent.Farm decideActivitySet
+FINE: Opt-out made: 1 for farm 11730
+Oct 02, 2018 12:39:10 PM mathematical_programming.SwissLand runModel
+INFO: Starting MP model
+Oct 02, 2018 12:39:10 PM mathematical_programming.SwissLand runModel
+INFO: Waiting for output generated by MP model
+Oct 02, 2018 12:39:11 PM main.Consumat main
+INFO: Year 2 simulation finished
+Oct 02, 2018 12:39:11 PM main.Consumat main
+INFO: ABM Operation Complete.
diff --git a/projdir/DataBaseOut/IF_agentPflanze.gms b/projdir/DataBaseOut/IF_agentPflanze.gms
@@ -42,11 +42,11 @@ Parameter          IF_agentPflanze(s_agentenID,s_pflanzen)
 10290.andKulturen 0.00
 10290.obst 0.00
 10290.beeren 0.00
-10290.ackerbrache 1.00
-10290.kunstwiese 1.00
-10290.extWiese 1.00
-10290.streueTorf 1.00
-10290.hecken 1.00
+10290.ackerbrache 0.00
+10290.kunstwiese 0.00
+10290.extWiese 0.00
+10290.streueTorf 0.00
+10290.hecken 0.00
 10290.wenigIntWiese 0.00
 10290.naturWiese 0.00
 10290.extWeide 0.00
@@ -90,12 +90,12 @@ Parameter          IF_agentPflanze(s_agentenID,s_pflanzen)
 11730.huelsenfruechte 0.00
 11730.obst 0.00
 11730.beeren 0.00
-11730.ackerbrache 1.00
-11730.kunstwiese 1.00
-11730.extWiese 1.00
-11730.streueTorf 1.00
-11730.hecken 1.00
-11730.wenigIntWiese 1.00
+11730.ackerbrache 0.00
+11730.kunstwiese 0.00
+11730.extWiese 0.00
+11730.streueTorf 0.00
+11730.hecken 0.00
+11730.wenigIntWiese 0.00
 11730.naturWiese 0.00
 11730.extWeide 0.00
 11730.naturWeide 0.00

diff --git a/projdir/DataBaseOut/IF_agentTiere.gms b/projdir/DataBaseOut/IF_agentTiere.gms
@@ -1,6 +1,6 @@
 Parameter IF_agentTiere(s_agentenID,s_tiere) /
 
-10110.milchkuehe 1.00
+10110.milchkuehe 0.00
 10110.mutterkuehe 0.00
 10110.aufzucht_miku 0.00
 10110.jungvieh_miku 0.00
@@ -38,7 +38,7 @@ Parameter IF_agentTiere(s_agentenID,s_tiere) /
 10310.mastsauen 0.00
 10310.mastpoulets 0.00
 10310.legehennen 0.00
-10310.pferde 1.00
+10310.pferde 0.00
 10310.schafe 0.00
 10310.ziegen 0.00
 10310.kaelber_miku 0.00

diff --git a/src/main/Consumat.java b/src/main/Consumat.java
@@ -33,7 +33,7 @@ public class Consumat {
 
 	public static void main(String[] args) {
 		initializeLogging();
-		LOGGER.info("Starting FARMIND: version number: 0.8.6");
+		LOGGER.info("Starting FARMIND: version number: 0.8.7");
 
 		CommandLine cmd = parseInput(args);														   // parse input arguments
 		ReadData            reader             = new ReadData();							       // read all input data files