Updated version number and documentation

AECP-ETHZ · Apr 23, 2019 · 50f5041 · 50f5041
1 parent a30a790
commit 50f5041
Show file tree

Hide file tree

Showing 89 changed files with 1,494 additions and 559 deletions.
diff --git a/doc/activity/Activity.html b/doc/activity/Activity.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_152) on Mon Jan 21 15:56:14 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_152) on Tue Apr 23 15:00:26 CEST 2019 -->
 <title>Activity</title>
-<meta name="date" content="2019-01-21">
+<meta name="date" content="2019-04-23">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>

diff --git a/doc/activity/class-use/Activity.html b/doc/activity/class-use/Activity.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_152) on Mon Jan 21 15:56:15 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_152) on Tue Apr 23 15:00:26 CEST 2019 -->
 <title>Uses of Class activity.Activity</title>
-<meta name="date" content="2019-01-21">
+<meta name="date" content="2019-04-23">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -164,7 +164,7 @@ <h3>Uses of <a href="../../activity/Activity.html" title="class in activity">Act
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../agent/Farm.html#Farm-java.lang.String-agent.Location-org.jgrapht.Graph-java.util.List-reader.FarmDataMatrix-reader.FarmDataMatrix-java.util.List-double-double-java.util.List-agent.Person-double-double-double-double-double-double-double-double-double-double-double-">Farm</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../agent/Farm.html#Farm-java.lang.String-agent.Location-org.jgrapht.Graph-java.util.List-reader.FarmDataMatrix-reader.FarmDataMatrix-java.util.List-double-double-java.util.List-agent.Person-double-double-double-double-double-double-double-double-double-double-double-double-int-double-">Farm</a></span>(java.lang.String&nbsp;name,
     <a href="../../agent/Location.html" title="class in agent">Location</a>&nbsp;location,
     org.jgrapht.Graph&lt;java.lang.String,org.jgrapht.graph.DefaultEdge&gt;&nbsp;socialNetwork,
     java.util.List&lt;java.lang.Double&gt;&nbsp;incomeHistory,
@@ -185,12 +185,15 @@ <h3>Uses of <a href="../../activity/Activity.html" title="class in activity">Act
     double&nbsp;alpha_minus,
     double&nbsp;phi_plus,
     double&nbsp;phi_minus,
-    double&nbsp;fuzzy_size)</code>
+    double&nbsp;opt_fuzzy_size,
+    double&nbsp;imt_fuzzy_size,
+    int&nbsp;ranking_version,
+    double&nbsp;learning_rate)</code>
 <div class="block">This constructor sets up the parameters associated with a farm.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../agent/Farm.html#Farm-java.lang.String-agent.Location-org.jgrapht.Graph-java.util.List-reader.FarmDataMatrix-reader.FarmDataMatrix-java.util.List-double-double-java.util.List-agent.Person-double-double-double-double-double-double-double-double-double-double-double-">Farm</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../agent/Farm.html#Farm-java.lang.String-agent.Location-org.jgrapht.Graph-java.util.List-reader.FarmDataMatrix-reader.FarmDataMatrix-java.util.List-double-double-java.util.List-agent.Person-double-double-double-double-double-double-double-double-double-double-double-double-int-double-">Farm</a></span>(java.lang.String&nbsp;name,
     <a href="../../agent/Location.html" title="class in agent">Location</a>&nbsp;location,
     org.jgrapht.Graph&lt;java.lang.String,org.jgrapht.graph.DefaultEdge&gt;&nbsp;socialNetwork,
     java.util.List&lt;java.lang.Double&gt;&nbsp;incomeHistory,
@@ -211,7 +214,10 @@ <h3>Uses of <a href="../../activity/Activity.html" title="class in activity">Act
     double&nbsp;alpha_minus,
     double&nbsp;phi_plus,
     double&nbsp;phi_minus,
-    double&nbsp;fuzzy_size)</code>
+    double&nbsp;opt_fuzzy_size,
+    double&nbsp;imt_fuzzy_size,
+    int&nbsp;ranking_version,
+    double&nbsp;learning_rate)</code>
 <div class="block">This constructor sets up the parameters associated with a farm.</div>
 </td>
 </tr>
@@ -331,23 +337,32 @@ <h3>Uses of <a href="../../activity/Activity.html" title="class in activity">Act
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../activity/Activity.html" title="class in activity">Activity</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">SwissLand.</span><code><span class="memberNameLink"><a href="../../mathematical_programming/SwissLand.html#getExitActivity--">getExitActivity</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">Toy.</span><code><span class="memberNameLink"><a href="../../mathematical_programming/Toy.html#getExitActivity--">getExitActivity</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../activity/Activity.html" title="class in activity">Activity</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">SwissLand.</span><code><span class="memberNameLink"><a href="../../mathematical_programming/SwissLand.html#getExitActivity--">getExitActivity</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../activity/Activity.html" title="class in activity">Activity</a>&gt;</code></td>
 <td class="colLast"><span class="typeNameLabel">MP_Interface.</span><code><span class="memberNameLink"><a href="../../mathematical_programming/MP_Interface.html#getExitActivity--">getExitActivity</a></span>()</code>
 <div class="block">If agent leaves system then we set an exit activity.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../activity/Activity.html" title="class in activity">Activity</a>&gt;</code></td>
 <td class="colLast"><span class="typeNameLabel">FarmDyn.</span><code><span class="memberNameLink"><a href="../../mathematical_programming/FarmDyn.html#getExitActivity--">getExitActivity</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.util.ArrayList&lt;<a href="../../activity/Activity.html" title="class in activity">Activity</a>&gt;&gt;</code></td>
 <td class="colLast"><span class="typeNameLabel">WeedControl.</span><code><span class="memberNameLink"><a href="../../mathematical_programming/WeedControl.html#readMPActivities-java.util.Properties-java.util.List-">readMPActivities</a></span>(java.util.Properties&nbsp;cmd,
                 java.util.List&lt;<a href="../../agent/Farm.html" title="class in agent">Farm</a>&gt;&nbsp;allFarms)</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.List&lt;java.util.ArrayList&lt;<a href="../../activity/Activity.html" title="class in activity">Activity</a>&gt;&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Toy.</span><code><span class="memberNameLink"><a href="../../mathematical_programming/Toy.html#readMPActivities-java.util.Properties-java.util.List-">readMPActivities</a></span>(java.util.Properties&nbsp;cmd,
+                java.util.List&lt;<a href="../../agent/Farm.html" title="class in agent">Farm</a>&gt;&nbsp;allFarms)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.util.ArrayList&lt;<a href="../../activity/Activity.html" title="class in activity">Activity</a>&gt;&gt;</code></td>
 <td class="colLast"><span class="typeNameLabel">SwissLand.</span><code><span class="memberNameLink"><a href="../../mathematical_programming/SwissLand.html#readMPActivities-java.util.Properties-java.util.List-">readMPActivities</a></span>(java.util.Properties&nbsp;cmd,

diff --git a/doc/activity/package-frame.html b/doc/activity/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_152) on Mon Jan 21 15:56:14 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_152) on Tue Apr 23 15:00:26 CEST 2019 -->
 <title>activity</title>
-<meta name="date" content="2019-01-21">
+<meta name="date" content="2019-04-23">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>

diff --git a/doc/activity/package-summary.html b/doc/activity/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_152) on Mon Jan 21 15:56:14 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_152) on Tue Apr 23 15:00:26 CEST 2019 -->
 <title>activity</title>
-<meta name="date" content="2019-01-21">
+<meta name="date" content="2019-04-23">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>

diff --git a/doc/activity/package-tree.html b/doc/activity/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_152) on Mon Jan 21 15:56:14 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_152) on Tue Apr 23 15:00:26 CEST 2019 -->
 <title>activity Class Hierarchy</title>
-<meta name="date" content="2019-01-21">
+<meta name="date" content="2019-04-23">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>

diff --git a/doc/activity/package-use.html b/doc/activity/package-use.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_152) on Mon Jan 21 15:56:15 CET 2019 -->
+<!-- Generated by javadoc (1.8.0_152) on Tue Apr 23 15:00:26 CEST 2019 -->
 <title>Uses of Package activity</title>
-<meta name="date" content="2019-01-21">
+<meta name="date" content="2019-04-23">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>