Skip to content

Commit

Permalink
added exit activity to swissland and checks on input data for sanity
Browse files Browse the repository at this point in the history
  • Loading branch information
kekeller committed Oct 2, 2018
1 parent afb929f commit fa807a3
Show file tree
Hide file tree
Showing 16 changed files with 502 additions and 482 deletions.
8 changes: 8 additions & 0 deletions ABM.log.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Oct 02, 2018 12:36:05 PM main.Consumat main
INFO: Starting FARMIND: version number: 0.8.6
Oct 02, 2018 12:36:05 PM main.Consumat main
INFO: Year 1 simulation started
Oct 02, 2018 12:36:05 PM mathematical_programming.SwissLand runModel
INFO: Starting MP model
Oct 02, 2018 12:36:05 PM mathematical_programming.SwissLand runModel
INFO: Waiting for output generated by MP model
378 changes: 0 additions & 378 deletions data-swissland/Grossmargin_P4,00.csv

This file was deleted.

8 changes: 4 additions & 4 deletions projdir/DataBaseIn/data_FARMIND.gms → data/data_FARMIND.gms
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Parameter FARMIND (s_agentenID) /

10110,215209.69
10290,455089.50
10310,97245.41
11730,63013.96
10110,-102123.48
10290,-60104.62
10310,-73750.52
11730,-24276.86
11740,83810.94
11800,80311.90
11870,42466.04
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,10 @@
Parameter data_FARMINDLandData(s_agentenID,s_pflanzen) /

10110,silomais, 9.56
10110,andKulturen, 5.62
10110,andDauerkulturen, 1.10
10110,wenigIntWiese, 0.45
10110,naturWiese, 1.60
10110,naturWeide, 0.70
10110,forst, 3.74
10110,hochstamm, 70.00
10290,silomais, 10.74
10290,futterrueben, 1.23
10290,andKulturen, 12.37
10290,naturWiese, 3.39
10110,naturWeide, -0.14
10290,forst, 7.00
10290,hochstamm, 150.07
10310,wenigIntWiese, 12.99
10310,naturWiese, 11.17
10310,soemmerung, 7.00
10310,forst, 5.84
11730,wenigIntWiese, 2.01
11730,naturWiese, 9.44
11730,forst, 0.57
11730,hochstamm, 35.00
11740,wenigIntWiese, 0.90
11740,naturWiese, 12.39
11740,forst, 1.17
Expand Down
71 changes: 71 additions & 0 deletions projdir/DataModelIn/data_FARMIND.gms
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
Parameter FARMIND (s_agentenID) /

10110,-102123.48
10290,-60104.62
10310,-73750.52
11730,-24276.86
11740,83810.94
11800,80311.90
11870,42466.04
12650,115583.89
12691,14230.53
13110,71308.12
13220,30261.63
14430,43845.31
14990,139898.32
15530,133785.53
15730,121855.45
15850,70226.87
16450,253956.35
16620,136864.77
16850,72971.63
17482,207109.82
17723,48158.35
18020,65773.43
19970,120718.53
20110,5198.30
21160,36248.88
21370,100607.38
21820,64404.50
22040,78216.60
22650,182468.79
22742,-8945.54
23142,354009.56
24410,146381.48
24620,38946.72
25190,481626.20
25211,117910.17
25330,62889.50
25703,80831.47
28320,59346.84
28330,78502.27
28760,450855.56
29133,6785.91
29372,-126940.79
29490,174771.47
29500,87691.98
30080,255981.38
30200,16249.41
30470,46268.69
30760,121861.76
30790,954929.04
31830,342518.33
32051,47230.19
32191,58506.64
32933,20903.38
32970,59066.61
33270,77219.05
33550,198079.32
33790,56970.60
33811,42523.34
34590,91101.72
35090,278949.31
35352,17961.60
35403,-11851.99
35540,88672.80
36473,64727.08
36493,178211.76
36570,133926.82
36722,7220.49
36970,-17994.37
/;
Loading

0 comments on commit fa807a3

Please sign in to comment.