[virtualcommons-svn] SF.net SVN: virtualcommons:[494] foraging/trunk/src/main

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 494
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=494&view=rev
Author:   dbarge
Date:     2010-03-25 21:22:19 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
This code version has following improvements
1) Quiz responses are more informative. After submitting the responses the players are notified about the 
   correct and incorrect answers.
   
2) Added an option to the GUI to select the type of treatment from the facilitator end.
   This is a workaround for selecting either full-vision treatment or limited-vision treatment.

Modified Paths:
--------------
    foraging/trunk/src/main/resources/configuration/round0.xml
    foraging/trunk/src/main/resources/configuration/round4.xml

Added Paths:
-----------
    foraging/trunk/src/main/webapp/
    foraging/trunk/src/main/webapp/WEB-INF/
    foraging/trunk/src/main/webapp/WEB-INF/web.xml
    foraging/trunk/src/main/webapp/client.jar
    foraging/trunk/src/main/webapp/client.jnlp
    foraging/trunk/src/main/webapp/csidex.jar
    foraging/trunk/src/main/webapp/facilitator.jar
    foraging/trunk/src/main/webapp/facilitator.jnlp
    foraging/trunk/src/main/webapp/images/
    foraging/trunk/src/main/webapp/images/5neighbors.jpg
    foraging/trunk/src/main/webapp/images/8neighbors.jpg
    foraging/trunk/src/main/webapp/images/abstract.jpg
    foraging/trunk/src/main/webapp/images/age-token-graph.jpg
    foraging/trunk/src/main/webapp/images/bg-grass.jpg
    foraging/trunk/src/main/webapp/images/blank.gif
    foraging/trunk/src/main/webapp/images/freeze-self.gif
    foraging/trunk/src/main/webapp/images/gem-gray.gif
    foraging/trunk/src/main/webapp/images/gem-other.gif
    foraging/trunk/src/main/webapp/images/gem-purple.gif
    foraging/trunk/src/main/webapp/images/gem-red.gif
    foraging/trunk/src/main/webapp/images/gem-self-explicit.gif
    foraging/trunk/src/main/webapp/images/gem-self.gif
    foraging/trunk/src/main/webapp/images/gem-token.gif
    foraging/trunk/src/main/webapp/images/icon.gif
    foraging/trunk/src/main/webapp/images/image1.gif
    foraging/trunk/src/main/webapp/images/image2.gif
    foraging/trunk/src/main/webapp/images/matte.gif
    foraging/trunk/src/main/webapp/images/neighborhood.jpg
    foraging/trunk/src/main/webapp/images/possible-neighboring-tokens.jpg
    foraging/trunk/src/main/webapp/images/question2.jpg
    foraging/trunk/src/main/webapp/images/question2_orig.jpg
    foraging/trunk/src/main/webapp/images/sanction-blue.jpg
    foraging/trunk/src/main/webapp/images/sanction-yellow.jpg
    foraging/trunk/src/main/webapp/images/trees.jpg
    foraging/trunk/src/main/webapp/images/vision-range.jpg
    foraging/trunk/src/main/webapp/index.html

Modified: foraging/trunk/src/main/resources/configuration/round0.xml
===================================================================

--- foraging/trunk/src/main/resources/configuration/round0.xml	2010-03-25 21:20:57 UTC (rev 493)
+++ foraging/trunk/src/main/resources/configuration/round0.xml	2010-03-25 21:22:19 UTC (rev 494)
@@ -46,7 +46,7 @@
 </p>
 <br>
 <form>
-Which of the statements is <b><u>incorrect</u></b>? <br>
+(Q1)Which of the statements is <b><u>incorrect</u></b>? <br>
 <input type="radio" name="q1" value="A">Your decisions of where to collect tokens affects the regeneration of tokens.<br>
 <input type="radio" name="q1" value="B">When you have collected all tokens on
 the screen, no new tokens will appear.<br>
@@ -56,7 +56,7 @@
 to press the space bar while your yellow dot <img src="@CODEBASE_URL@/images/gem-self.gif"> is on a cell with a token.<br>
 <br><br>
 
-Which sequence of situations is not possible? <br>
+(Q2)Which sequence of situations is <b><u>not possible</u></b>? <br>
 <img src="@CODEBASE_URL@/images/question2.jpg"><br>
 <input type="radio" name="q2" value="A">A<br>
 <input type="radio" name="q2" value="B">B<br>

Modified: foraging/trunk/src/main/resources/configuration/round4.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/round4.xml	2010-03-25 21:20:57 UTC (rev 493)
+++ foraging/trunk/src/main/resources/configuration/round4.xml	2010-03-25 21:22:19 UTC (rev 494)
@@ -114,7 +114,7 @@
 </p>
 
 <form>
-Each time I press the numeric keys between 1-5 my tokens will be reduced
+(Q1)Each time I press the numeric keys between 1-5 my tokens will be reduced
 by:<br>
 <input type="radio" name="q1" value="0">0 tokens<br>
 <input type="radio" name="q1" value="1">1 token<br>
@@ -122,7 +122,7 @@
 <input type="radio" name="q1" value="4">4 tokens<br>
 <br><br>
 
-Each time I press the numeric keys between 1-5 the number of tokens of the
+(Q2)Each time I press the numeric keys between 1-5 the number of tokens of the
 corresponding participant is reduced by:<br>
 <input type="radio" name="q2" value="0">0 tokens<br>
 <input type="radio" name="q2" value="1">1 token<br>
@@ -130,7 +130,7 @@
 <input type="radio" name="q2" value="4">4 tokens<br>
 <br><br>
 
-The background of your yellow dot <img src="@CODEBASE_URL@/images/gem-self.gif"> turns blue.  What does this represent?<br>
+(Q3)The background of your yellow dot <img src="@CODEBASE_URL@/images/gem-self.gif"> turns blue.  What does this represent?<br>
 <input type="radio" name="q3" value="0">You collected a token<br>
 <input type="radio" name="q3" value="1">Another participant is subtracting two
 tokens from you<br>
@@ -139,7 +139,7 @@
 <input type="radio" name="q3" value="3">You are moving too fast<br>
 <br><br>
 
-Every time I press the numeric keys between 1-5:<br>
+(Q4)Every time I press the numeric keys between 1-5:<br>
 <input type="radio" name="q4" value="0">Two tokens are subtracted from my tokens
 collected this round<br>
 <input type="radio" name="q4" value="1">One token is subtracted from my tokens

Added: foraging/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- foraging/trunk/src/main/webapp/WEB-INF/web.xml	                        (rev 0)
+++ foraging/trunk/src/main/webapp/WEB-INF/web.xml	2010-03-25 21:22:19 UTC (rev 494)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+vim:sts=2:sw=2
+-->
+<web-app>
+
+  <display-name>The Virtual Commons Foraging Experiment</display-name>
+
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
+</web-app>

Added: foraging/trunk/src/main/webapp/client.jar
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/client.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/client.jnlp
===================================================================
--- foraging/trunk/src/main/webapp/client.jnlp	                        (rev 0)
+++ foraging/trunk/src/main/webapp/client.jnlp	2010-03-25 21:22:19 UTC (rev 494)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- JNLP file for foraging client -->
+<jnlp spec="1.6+" codebase="http://localhost:8080/" href="client.jnlp">
+  <information>
+    <title>Virtual Commons Experiment</title>
+    <vendor>The Virtual Commons, Center for the Study of Institutional Diversity, School of Human Evolution and Social Change, Dr. Marco Janssen, Allen Lee, Deepali Bhagvat</vendor>
+    <homepage href="http://commons.asu.edu"/>
+    <description>An experiment brought to you courtesy of The Virtual Commons - http://commons.asu.edu</description>
+  </information> 
+  <offline-allowed />
+  <resources> 
+    <j2se version="1.6+"/>
+    <jar href="client.jar"/>
+    <jar href='csidex.jar'/>
+    <property name="sun.java2d.noddraw" value="true"/> 
+    <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp"/>
+  </resources>
+  <application-desc main-class="edu.asu.commons.foraging.client.ForagingClient"/> 
+</jnlp>
+

Added: foraging/trunk/src/main/webapp/csidex.jar
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/csidex.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/facilitator.jar
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/facilitator.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/facilitator.jnlp
===================================================================
--- foraging/trunk/src/main/webapp/facilitator.jnlp	                        (rev 0)
+++ foraging/trunk/src/main/webapp/facilitator.jnlp	2010-03-25 21:22:19 UTC (rev 494)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- JNLP File for CSAN 2D Facilitator -->
+<jnlp spec="1.6+" codebase="http://localhost:8080/" href="facilitator.jnlp">
+  <information>
+    <title>Virtual Commons Experiment</title>
+    <vendor>The Virtual Commons, Center for the Study of Institutional Diversity, School of Human Evolution and Social Change, Dr. Marco Janssen, Allen Lee, Deepali Bhagvat</vendor>
+    <homepage href="http://commons.asu.edu"/>
+    <description>Foraging 2D facilitator interface to control the Foraging 2D experiment.</description>
+    <icon href="commons.gif"/> 
+  </information> 
+  <offline-allowed />
+  <resources> 
+    <j2se version="1.6+"/>
+    <jar href="facilitator.jar"/>
+    <jar href='csidex.jar'/>
+  </resources>
+  <application-desc main-class="edu.asu.commons.foraging.facilitator.Facilitator"/> 
+</jnlp>
+

Added: foraging/trunk/src/main/webapp/images/5neighbors.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/5neighbors.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/8neighbors.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/8neighbors.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/abstract.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/abstract.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/age-token-graph.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/age-token-graph.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/bg-grass.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/bg-grass.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/blank.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/blank.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/freeze-self.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/freeze-self.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/gem-gray.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/gem-gray.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/gem-other.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/gem-other.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/gem-purple.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/gem-purple.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/gem-red.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/gem-red.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/gem-self-explicit.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/gem-self-explicit.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/gem-self.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/gem-self.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/gem-token.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/gem-token.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/icon.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/icon.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/image1.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/image1.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/image2.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/image2.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/matte.gif
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/matte.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/neighborhood.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/neighborhood.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/possible-neighboring-tokens.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/possible-neighboring-tokens.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/question2.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/question2.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/question2_orig.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/question2_orig.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/sanction-blue.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/sanction-blue.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/sanction-yellow.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/sanction-yellow.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/trees.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/trees.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/images/vision-range.jpg
===================================================================
(Binary files differ)


Property changes on: foraging/trunk/src/main/webapp/images/vision-range.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: foraging/trunk/src/main/webapp/index.html
===================================================================
--- foraging/trunk/src/main/webapp/index.html	                        (rev 0)
+++ foraging/trunk/src/main/webapp/index.html	2010-03-25 21:22:19 UTC (rev 494)
@@ -0,0 +1,13 @@
+<html>
+<head>
+<META HTTP-EQUIV="Refresh" CONTENT="5;URL=client.jnlp">
+<title>Virtual Commons Experiment Client</title>
+</head>
+<body>
+<p>
+Automatically starting the client.  Please <a href='javascript:void()'
+onclick='window.close()'>close</a> this window after the client
+loads.  NOTE: <b>Do not reload or refresh</b> this window.
+</p>
+</body>
+</html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


