changed input reading (results of gams) to match current gams model

At the moment we read two indiviudal files that contain the income and activities for each agent
AECP-ETHZ · Sep 25, 2018 · 54057a6 · 54057a6
1 parent 227851b
commit 54057a6
Show file tree

Hide file tree

Showing 14 changed files with 907 additions and 3,430 deletions.
diff --git a/data-weedcontrol/Grossmargin_P4,00.csv b/data-weedcontrol/Grossmargin_P4,00.csv
diff --git a/data-weedcontrol/yearly_prices.csv b/data-weedcontrol/yearly_prices.csv
@@ -1,7 +1,11 @@
 "year","price"
-2004,4.4
-2005,4.7
-2006,4.9
-2007,4.2
-2008,5.2
-2009,4.3
+1999,3.8
+2000,3.75
+2001,3.8
+2002,3.85
+2003,3.8
+2006,3.85
+2007,3.95
+2008,3.85
+2009,4.1
+2010,3.7
diff --git a/data/Grossmargin_P4,00.csv b/data/Grossmargin_P4,00.csv
diff --git a/data/activity_preference.csv b/data/activity_preference.csv
diff --git a/data/farm_parameters.csv b/data/farm_parameters.csv