Updated docs.
diff --git a/documentation/amp.pdf b/documentation/amp.pdf
index f8d7bab..6d7a77f 100644
--- a/documentation/amp.pdf
+++ b/documentation/amp.pdf
Binary files differ
diff --git a/documentation/contents/Installation_Guide.html b/documentation/contents/Installation_Guide.html
index 7b41494..c8f2e61 100644
--- a/documentation/contents/Installation_Guide.html
+++ b/documentation/contents/Installation_Guide.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Chapter 6. Installation Guide</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="up" href="index.html" title="Agent Modeling Guide">
<link rel="prev" href="Programer_Guide.html" title="Chapter 5. Programer Guide">
diff --git a/documentation/contents/Introduction.html b/documentation/contents/Introduction.html
index ba89e94..a4cb610 100644
--- a/documentation/contents/Introduction.html
+++ b/documentation/contents/Introduction.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Chapter 1. Introduction</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="up" href="index.html" title="Agent Modeling Guide">
<link rel="prev" href="index.html" title="Agent Modeling Guide">
@@ -358,11 +358,11 @@
<p>Metascape, LLC is the primary contributor to AMP and provides Agent-Based Modeling tools, including sophisticated tools based on the AMF platform, and comprehensive consulting services. For more information on Metascape products and services visit
<a class="ulink" href="http://metascapeabm.com" target="_new">http://metascapeabm.com</a>.
</p>
-<p>The AMF meta-model started life as
- <a class="ulink" href="/wiki/http://www.agent2005.anl.gov/2006procpdf/Parker_Agent_2006.pdf" target="_new">"score"</a>, a component of the Repast Simphony environment. Argonne National Labs supported the initial development in 2007 and agreed to contribute the relevant IP to the Eclipse project in 2009. It wasn't fully utilized within Simphony, and migrated from there to the MetaABM project supported by Metascape. The MetaABM project defined a complete editor, code-generation and model execution suite that formed the initial AMP AMF contribution. Metascape has sponsored the development of AMF from 2007 through the present.
+<p>The AMF meta-model started life in 2007 as
+ <a class="ulink" href="/wiki/http://www.agent2005.anl.gov/2006procpdf/Parker_Agent_2006.pdf" target="_new">"score"</a>, a component of the Repast Simphony environment and was contributed under the EPL by Argonne National Labs. AMF was further developed by Metascape starting in 2007 as the MetaABM project, and it along with what becase AMP where was contributed by Metascape to Eclipse in 2009. Metascape continues to be the primary sponsor and contributor to the project.
</p>
<p>The AMP logo was inspired by the
- <a class="ulink" href="/wiki/http://swarm.org_Swarm_logo" target="_new">http://swarm.org Swarm logo</a> with their kind permission.
+ <a class="ulink" href="/wiki/http://swarm.org_Swarm_logo" target="_new">http://swarm.org Swarm logo</a> and is used with their kind permission.
</p>
</div>
</div>
diff --git a/documentation/contents/Modeler_Guide.html b/documentation/contents/Modeler_Guide.html
index e342a7b..874f1f3 100644
--- a/documentation/contents/Modeler_Guide.html
+++ b/documentation/contents/Modeler_Guide.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Chapter 2. Modeler Guide</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="up" href="index.html" title="Agent Modeling Guide">
<link rel="prev" href="Introduction.html" title="Chapter 1. Introduction">
diff --git a/documentation/contents/New_and_Noteworthy.html b/documentation/contents/New_and_Noteworthy.html
index 8f1e77d..6b2f5a4 100644
--- a/documentation/contents/New_and_Noteworthy.html
+++ b/documentation/contents/New_and_Noteworthy.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Chapter 7. New and Noteworthy</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="up" href="index.html" title="Agent Modeling Guide">
<link rel="prev" href="Installation_Guide.html" title="Chapter 6. Installation Guide">
@@ -75,7 +75,7 @@
</div>
</div>
</div>
-<table id="N114CD">
+<table id="N114D7">
<tr>
<td>
@@ -141,7 +141,7 @@
</div>
</div>
</div>
-<table id="N11534">
+<table id="N1153E">
<tr>
<td>
@@ -205,7 +205,7 @@
</div>
</div>
</div>
-<table id="N11597">
+<table id="N115A1">
<tr>
<td>
@@ -252,13 +252,13 @@
</div>
</div>
</div>
-<table id="N115DD">
+<table id="N115E7">
<tr>
<td>
<span class="bold"><strong>Parameter Management Support</strong></span>
</td>
- <td>AMP now has full support for editing and launching of parameter files, including code completion. There is also support for creation of tests and analysis of test results. Finally, data can now be generated to a common EMD based (adata) data format.</td>
+ <td>AMP now has full support for editing and launching of parameter files, including code completion and all of the other editor niceties.</td>
</tr>
<tr>
@@ -310,7 +310,7 @@
</div>
</div>
</div>
-<table id="N11634">
+<table id="N1163E">
<tr>
<td>
diff --git a/documentation/contents/Programer_Guide.html b/documentation/contents/Programer_Guide.html
index 3968484..acda65e 100644
--- a/documentation/contents/Programer_Guide.html
+++ b/documentation/contents/Programer_Guide.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Chapter 5. Programer Guide</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="up" href="index.html" title="Agent Modeling Guide">
<link rel="prev" href="Tutorials.html" title="Chapter 4. Tutorials">
diff --git a/documentation/contents/Resources.html b/documentation/contents/Resources.html
index e5c9242..101148f 100644
--- a/documentation/contents/Resources.html
+++ b/documentation/contents/Resources.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Chapter 8. Resources</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="up" href="index.html" title="Agent Modeling Guide">
<link rel="prev" href="New_and_Noteworthy.html" title="Chapter 7. New and Noteworthy">
diff --git a/documentation/contents/Support.html b/documentation/contents/Support.html
index fbdb987..2190075 100644
--- a/documentation/contents/Support.html
+++ b/documentation/contents/Support.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Chapter 9. Support</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="up" href="index.html" title="Agent Modeling Guide">
<link rel="prev" href="Resources.html" title="Chapter 8. Resources">
diff --git a/documentation/contents/Tutorials.html b/documentation/contents/Tutorials.html
index fd6535c..895d3b5 100644
--- a/documentation/contents/Tutorials.html
+++ b/documentation/contents/Tutorials.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Chapter 4. Tutorials</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="up" href="index.html" title="Agent Modeling Guide">
<link rel="prev" href="User_Guide.html" title="Chapter 3. User Guide">
@@ -80,7 +80,7 @@
</dl>
</dd>
<dt>
-<span class="section"><a href="Tutorials.html#Actions_4">Actions</a></span>
+<span class="section"><a href="Tutorials.html#Actions_Part_I">Actions Part I</a></span>
</dt>
<dd>
<dl>
@@ -103,7 +103,7 @@
</dl>
</dd>
<dt>
-<span class="section"><a href="Tutorials.html#Actions_2_Movement_Rule">Actions 2 Movement Rule</a></span>
+<span class="section"><a href="Tutorials.html#Actions_Part_II">Actions Part II</a></span>
</dt>
<dd>
<dl>
@@ -483,12 +483,12 @@
</div>
</div>
</div>
-<div class="section" title="Actions">
+<div class="section" title="Actions Part I">
<div class="titlepage">
<div>
<div>
<h3 class="title">
-<a name="Actions_4"></a>Actions</h3>
+<a name="Actions_Part_I"></a>Actions Part I</h3>
</div>
</div>
</div>
@@ -711,12 +711,12 @@
</div>
</div>
</div>
-<div class="section" title="Actions 2 Movement Rule">
+<div class="section" title="Actions Part II">
<div class="titlepage">
<div>
<div>
<h3 class="title">
-<a name="Actions_2_Movement_Rule"></a>Actions 2 Movement Rule</h3>
+<a name="Actions_Part_II"></a>Actions Part II</h3>
</div>
</div>
</div>
@@ -749,12 +749,12 @@
</p>
<p>Often, we would pick the "Spatial: Neighbor" function to take a random walk, but according to the specification, we actually want to move into some random Cell within distance four (4). So we will pick "Spatial: Within" from the list of functions.</p>
</div>
-<div class="section" title="Model Error Handling">
+<div class="section" title="Fixing Model Errors">
<div class="titlepage">
<div>
<div>
<h5 class="title">
-<a name="Model_Error_Handling"></a>Model Error Handling</h5>
+<a name="Fixing_Model_Errors"></a>Fixing Model Errors</h5>
</div>
</div>
</div>
@@ -770,7 +770,7 @@
<p>
</p>
-<p>In addition to error markers, metaABM provides warnings designed to help you avoid common design mistakes. For example, a warning will be issued if you attempt to move an agent from its selection to the same selection; this is not strictly speaking an error, but it doesn't make much sense. You'll also recieve warning for default values that have not been specified. You might notice that the Demographic Prisonner's Dilemma model has warning markers, this is because we were happy with the '0' default values for the attributes and didn't provide any. (By the way, you might also notice a number of Java warnings. By default the Eclipse IDE is very conservative when it comes to warnings, and expects the usage of language constructs that we choose not to use. A full discussion of all of this is beyond the scope of the tutorial, but see the Eclipse documentation on problem views for more ideas about how to customize these views.)</p>
+<p>In addition to error markers, metaABM provides warnings designed to help you avoid common design mistakes. For example, a warning will be issued if you attempt to move an agent from its selection to the same selection; this is not strictly speaking an error, but it doesn't make much sense. You'll also receive a warning for default values that have not been specified. You might notice that the Demographic Prisonner's Dilemma model has warning markers, this is because we were happy with the '0' default values for the attributes and didn't provide any. (By the way, you might also notice a number of Java warnings. By default the Eclipse IDE is very conservative when it comes to warnings, and expects the usage of language constructs that we choose not to use. A full discussion of all of this is beyond the scope of the tutorial, but see the Eclipse documentation on problem views for more ideas about how to customize these views.)</p>
<p>To fix this error we just need to assign a value for search distance. We
<span class="bold"><strong>could</strong></span> simply create a literal for the Spatial: Within Query but that isn't really good practice. (Originally the Agent Modeling Framework didn't even support Literal values, but we added them for convenience.) Now, we will create our first Attribute. In this case, we want the Attribute to belong to the Stupid Model as it will be the same value for all Agents for now. So right-click on the Stupid Model context Attributes node and create a new one.
</p>
@@ -800,7 +800,20 @@
<p>
</p>
-<p>Now, we need to combine the requirement that the cell be available with the requirement that it be within 4 cell's distance. To accomplish this, we'll add an Intersection Action. The Logical Actions, including "Intersection", "Union" and "None" define how Query Actions work together. So create an Intersection Actions as a target of the Spatial Available Query. (Not the Within Query).</p>
+</div>
+<div class="section" title="Create Intersection Action">
+<div class="titlepage">
+<div>
+<div>
+<h5 class="title">
+<a name="Create_Intersection_Action"></a>Create Intersection Action</h5>
+</div>
+</div>
+</div>
+<p>Now, we need to combine the requirement that the cell be available with the requirement that it be within 4 cell's distance. To accomplish this, we'll add an Intersection Action. The Logical Actions, including "Intersection", "Union" and "None" define how Query Actions work together. The Intersection Action needs to be a target of
+ <span class="italic">both</span> the Available and Within targets. This means that the action has two sources. See the Modeler's Guide for more information about how action flow works.
+ </p>
+<p>Editing actions with multiple sources and targets is the most complex aspect of the model editor so you may need to work with this example a bit in order to get a feel for how it should work. First, we create the Intersection Action as a target of the Spatial Available Query. (Not the Within Query).</p>
<p>
</p>
@@ -809,9 +822,7 @@
<p>
</p>
-<p>The Intersection Action needs to be a target of
- <span class="italic">both</span> the Available and Within targets. To accomplish this, drag the Intersection Action over the Within Query. It's a bit hard to see this in a static image, but you simply need to click on the Intersection Action, move it so that it is over the Within target, and release the mouse.
- </p>
+<p>Then we need to make the Intersection Action a target of the Within Query as well. To accomplish this, we drag the Intersection Action over the Within Query while holding down the ctrl-key. Depending on your environment, you may need to begin dragging before you click the control key -- otherwise, your initial control click will bring up the context menu. It's a bit hard to see this in a static image, but you simply need to click on the Intersection Action, begin dragging, hold down the ctrl key, move the mouse so that it is over the Within target, and release the mouse. It sounds more complicated then it is!</p>
<p>
</p>
@@ -820,6 +831,16 @@
<p>
</p>
+</div>
+<div class="section" title="Add Move Action">
+<div class="titlepage">
+<div>
+<div>
+<h5 class="title">
+<a name="Add_Move_Action"></a>Add Move Action</h5>
+</div>
+</div>
+</div>
<p>Finally, add a Move target to the Intersection.</p>
<p>
diff --git a/documentation/contents/User_Guide.html b/documentation/contents/User_Guide.html
index c672f61..8700053 100644
--- a/documentation/contents/User_Guide.html
+++ b/documentation/contents/User_Guide.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Chapter 3. User Guide</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="up" href="index.html" title="Agent Modeling Guide">
<link rel="prev" href="Modeler_Guide.html" title="Chapter 2. Modeler Guide">
diff --git a/documentation/contents/index.html b/documentation/contents/index.html
index a7570cb..f1bfaa3 100644
--- a/documentation/contents/index.html
+++ b/documentation/contents/index.html
@@ -2,8 +2,8 @@
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Agent Modeling Guide</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link href="book.css" type="text/css" rel="stylesheet">
+<meta content="DocBook XSL Stylesheets V1.76.0" name="generator">
<link rel="home" href="index.html" title="Agent Modeling Guide">
<link rel="next" href="Introduction.html" title="Chapter 1. Introduction">
</head>
@@ -268,13 +268,13 @@
<span class="section"><a href="Tutorials.html#Structure_3">Structure</a></span>
</dt>
<dt>
-<span class="section"><a href="Tutorials.html#Actions_4">Actions</a></span>
+<span class="section"><a href="Tutorials.html#Actions_Part_I">Actions Part I</a></span>
</dt>
<dt>
<span class="section"><a href="Tutorials.html#Styles_2">Styles</a></span>
</dt>
<dt>
-<span class="section"><a href="Tutorials.html#Actions_2_Movement_Rule">Actions 2 Movement Rule</a></span>
+<span class="section"><a href="Tutorials.html#Actions_Part_II">Actions Part II</a></span>
</dt>
</dl>
</dd>
diff --git a/installing/_about_discovery.html b/installing/_about_discovery.html
index d38027c..40af2a4 100644
--- a/installing/_about_discovery.html
+++ b/installing/_about_discovery.html
@@ -1,24 +1,24 @@
-<h2>Discovery site AMP software information</h2>
-
-If you use the AMP download provided through the Modeling Discovery site, note that it includes software that is not
-provided by Eclipse and is delivered through a third-party download site.
-<h3>Why?</h3>
-The LWJGL 3D libraries are not Eclipse IP approved and so we can't provide them from the Eclipse website. These
-libraries are included in the installation because the AGF3D component which provides support for 3D visualization
-depends on the
-<a href="http://wiki.eclipse.org/GEF3D_Installation">Eclipse GEF3D</a>
-project, which in turn depends on the
-<a href="http://lwjgl.org/">LWJGL Java library</a>
-. While LWJGL has been released under an Eclipse compatible (BSD) license, there are two concerns that prevent it from
-meeting the Eclipse Foundation's strong IP approval process. First, there are some potential technical licensing
-issues that make the status of some of the included files unclear. Second, the LWJGL project has not firmly established
-the provenance (who wrote the code and when) of all of the code contributed.
-<h3>Does that matter?</h3>
-Only you or your organization can decide that, but it should only be a concern if you have a need to use only software
-that meets the very high standards of Eclipse hosted software projects.
-<h3>What should I do if I don't want the third party software?</h3>
-You can simply install the Eclipse AMP components directly from our
-<a href="http://www.eclipse.org/amp/installing/updates.php">Eclipse hosted update site</a>
-. Select all of the main components but do not select any of the items from the "Agent Modeling Extensions" category.
-Without the AGF 3D libraries you will not be able to view 3D visualizations of your models, but all other AMP features
-should function normally.
+<h2>Discovery site AMP software information</h2>
+
+If you use the AMP download provided through the Modeling Discovery site, note that it includes software that is not
+provided by Eclipse and is delivered through a third-party download site.
+<h3>Why?</h3>
+The LWJGL 3D libraries are not Eclipse IP approved and so we can't provide them from the Eclipse website. These
+libraries are included in the installation because the AGF3D component which provides support for 3D visualization
+depends on the
+<a href="http://wiki.eclipse.org/GEF3D_Installation">Eclipse GEF3D</a>
+project, which in turn depends on the
+<a href="http://lwjgl.org/">LWJGL Java library</a>
+. While LWJGL has been released under an Eclipse compatible (BSD) license, there are two concerns that prevent it from
+meeting the Eclipse Foundation's strong IP approval process. First, there are some potential technical licensing
+issues that make the status of some of the included files unclear. Second, the LWJGL project has not firmly established
+the provenance (who wrote the code and when) of all of the code contributed.
+<h3>Does that matter?</h3>
+Only you or your organization can decide that, but it should only be a concern if you have a need to use only software
+that meets the very high standards of Eclipse hosted software projects.
+<h3>What should I do if I don't want the third party software?</h3>
+You can simply install the Eclipse AMP components directly from our
+<a href="http://www.eclipse.org/amp/installing/updates.php">Eclipse hosted update site</a>
+. Select all of the main components but do not select any of the items from the "Agent Modeling Extensions" category.
+Without the AGF 3D libraries you will not be able to view 3D visualizations of your models, but all other AMP features
+should function normally.
