[virtualcommons-svn] SF.net SVN: virtualcommons:[522] foraging/trunk/src/main
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] SF.net SVN: virtualcommons:[522] foraging/trunk/src/main
|
From: <al...@us...> - 2010-06-30 19:17:54
|
Revision: 522
http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=522&view=rev
Author: alllee
Date: 2010-06-30 19:17:48 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
updated svn:keywords and adding quiz response + voting support to
ForagingSaveFileConverter
Modified Paths:
--------------
foraging/trunk/src/main/java/edu/asu/commons/foraging/client/EnforcementPanel.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/client/RegulationPanel.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementRankingRequest.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/QuizResponseEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationRankingRequest.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationSubmissionUpdateEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationUpdateEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SubmitRegulationRequest.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java
foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fullvision/round1.xml
Property Changed:
----------------
foraging/trunk/src/main/java/edu/asu/commons/foraging/client/EnforcementPanel.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/client/RegulationPanel.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/CensoredChatRequest.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementRankingRequest.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/FacilitatorCensoredChatRequest.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/MonitorTaxEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/QuizResponseEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationRankingRequest.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationSubmissionUpdateEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationUpdateEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SanctionAppliedEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SanctionUpdateEvent.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SubmitRegulationRequest.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/facilitator/FacilitatorChatPanel.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/model/EnforcementMechanism.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ForagingRole.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/model/SanctionMechanism.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/AviOutputStream.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/DataAtomOutputStream.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/DataChunkOutputStream.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/FilterImageOutputStream.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/IntervalChecker.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/MovieCreator.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/MovieCreatorProcessor.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/QuickTimeOutputStream.java
foraging/trunk/src/main/java/edu/asu/commons/foraging/util/VideoFormat.java
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/EnforcementPanel.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/EnforcementPanel.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/EnforcementPanel.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -20,12 +20,12 @@
import edu.asu.commons.net.Identifier;
/**
- * $Id: EnforcementPanel.java 45 2008-08-21 00:47:39Z dbarge $
+ * $Id$
*
* Enforcement panel is used to vote enforcement mechanism
*
* @author dbarge
- * @version $Revision: 45 $
+ * @version $Revision$
*/
@SuppressWarnings("serial")
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/EnforcementPanel.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/RegulationPanel.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/RegulationPanel.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/RegulationPanel.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -31,7 +31,7 @@
/**
- * $Id: Sanctioning.java 45 2008-08-21 00:47:39Z dbarge $
+ * $Id$
*
* Sanctioning panel is used to create regulations and
* enforcement mechanism
@@ -39,7 +39,7 @@
* FIXME: split this functionality out into two different panels, one for submission and the other for voting.
*
* @author dbarge
- * @version $Revision: 45 $
+ * @version $Revision$
*/
@SuppressWarnings("serial")
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/RegulationPanel.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/CensoredChatRequest.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -7,12 +7,12 @@
/**
- * $Id: VoteEvent.java 49 2008-09-04 16:57:40Z dbarge $
+ * $Id$
*
* Sent from the server to all clients about the
* updated vote stats
* @author <a href='db...@as...'>Deepak Barge</a>
- * @version $Revision: 49 $
+ * @version $Revision$
*/
public class EnforcementMechanismUpdateEvent extends AbstractEvent {
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementRankingRequest.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementRankingRequest.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementRankingRequest.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -2,16 +2,17 @@
import edu.asu.commons.event.AbstractPersistableEvent;
+import edu.asu.commons.foraging.model.SanctionMechanism;
import edu.asu.commons.net.Identifier;
/**
- * $Id: RegulationRequest.java 1 2008-07-23 22:15:18Z dbarge $
+ * $Id$
*
* Sent from a client to the server signaling that the client
* has updated the votes to the given options
*
- * @author <a href='db...@as...'>Deepak Barge</a>
- * @version $Revision: 1 $
+ * @author <a href='all...@as...'>Allen Lee</a>
+ * @version $Revision$
*/
public class EnforcementRankingRequest extends AbstractPersistableEvent {
@@ -28,4 +29,29 @@
public int[] getRankings() {
return rankings;
}
+
+ @Override
+ public String toString() {
+ return String.format("%s, %s, %s", id, "Enforcement Mechanism Ranking", convertRankings());
+ }
+
+ private String convertRankings() {
+ StringBuilder builder = new StringBuilder();
+ // FIXME: this will need to be changed after we fix voting which
+ // needs refactoring
+ switch (rankings[0]) {
+ case 0:
+ // voted for no sanctioning
+ builder.append("1: no sanctioning, 2: sanctioning");
+ break;
+ case 1:
+ // voted for sanctioning
+ builder.append("1: sanctioning, 2: no sanctioning");
+ break;
+ default:
+ System.err.println("Invalid ranking: " + rankings[0]);
+ }
+ return builder.toString();
+ }
+
}
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/EnforcementRankingRequest.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/FacilitatorCensoredChatRequest.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/MonitorTaxEvent.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/QuizResponseEvent.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/event/QuizResponseEvent.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/event/QuizResponseEvent.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -8,13 +8,13 @@
import edu.asu.commons.net.Identifier;
/**
- * $Id: QuizResponseEvent.java 461 2010-02-05 00:28:28Z alllee $
+ * $Id$
*
* A client's quiz responses for a given quiz page.
*
*
* @author <a href='mailto:All...@as...'>Allen Lee</a>
- * @version $Rev: 461 $
+ * @version $Rev$
*/
public class QuizResponseEvent extends AbstractPersistableEvent implements ClientRequest {
@@ -38,7 +38,8 @@
return incorrectAnswers;
}
+ @Override
public String toString() {
- return id + " quiz page response: " + responses + "\n\t incorrect: " + incorrectAnswers;
+ return String.format("%s, responses: %s, incorrect answers: %s", id, responses, incorrectAnswers);
}
}
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/QuizResponseEvent.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationRankingRequest.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationRankingRequest.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationRankingRequest.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -8,12 +8,12 @@
import edu.asu.commons.net.Identifier;
/**
- * $Id: RegulationRequest.java 1 2008-07-23 22:15:18Z dbarge $
+ * $Id$
*
*
*
* @author <a href='db...@as...'>Deepak Barge</a>
- * @version $Revision: 1 $
+ * @version $Revision$
*/
public class RegulationRankingRequest extends AbstractPersistableEvent {
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationRankingRequest.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationSubmissionUpdateEvent.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationSubmissionUpdateEvent.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationSubmissionUpdateEvent.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -7,12 +7,12 @@
/**
- * $Id: VoteEvent.java 49 2008-09-04 16:57:40Z dbarge $
+ * $Id$
*
* Sent from the server to all clients about the updated vote stats.
*
* @author <a href='db...@as...'>Deepak Barge</a>
- * @version $Revision: 49 $
+ * @version $Revision$
*/
public class RegulationSubmissionUpdateEvent extends AbstractEvent {
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationSubmissionUpdateEvent.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationUpdateEvent.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationUpdateEvent.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationUpdateEvent.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -7,12 +7,12 @@
/**
- * $Id: VoteEvent.java 49 2008-09-04 16:57:40Z dbarge $
+ * $Id$
*
* Notifices clients of the regulation data receiving the highest vote ranking.
*
* @author <a href='db...@as...'>Deepak Barge</a>
- * @version $Revision: 49 $
+ * @version $Revision$
*/
public class RegulationUpdateEvent extends AbstractEvent {
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/RegulationUpdateEvent.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SanctionAppliedEvent.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SanctionUpdateEvent.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SubmitRegulationRequest.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SubmitRegulationRequest.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SubmitRegulationRequest.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -5,12 +5,12 @@
import edu.asu.commons.net.Identifier;
/**
- * $Id: RegulationRequest.java 1 2008-07-23 22:15:18Z dbarge $
+ * $Id$
*
*
*
* @author <a href='db...@as...'>Deepak Barge</a>
- * @version $Revision: 1 $
+ * @version $Revision$
*/
public class SubmitRegulationRequest extends AbstractPersistableEvent {
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/event/SubmitRegulationRequest.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/facilitator/FacilitatorChatPanel.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/model/EnforcementMechanism.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ForagingRole.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/model/SanctionMechanism.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/AviOutputStream.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/DataAtomOutputStream.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/DataChunkOutputStream.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/FilterImageOutputStream.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java 2010-06-30 19:17:48 UTC (rev 522)
@@ -65,8 +65,8 @@
new AggregateTokenSpatialDistributionProcessor(),
new CollectedTokenSpatialDistributionProcessor(),
new MovementStatisticsProcessor(),
- new AggregateCollectedTokenNeighborProcessor(),
- new MovieCreatorProcessor()
+ new AggregateCollectedTokenNeighborProcessor()
+ // new MovieCreatorProcessor()
));
Persister.processSaveFiles(allSaveFilesDirectory, processors);
return true;
@@ -294,7 +294,7 @@
for (PersistableEvent event : actions) {
long elapsedTime = savedRoundData.getElapsedTimeInSeconds(event);
if (isIntervalElapsed(elapsedTime)) {
- writeData(writer, serverDataModel, clientSpatialDistributionMap);
+ writeData(writer, serverDataModel, clientSpatialDistributionMap);
}
if (event instanceof TokenCollectedEvent) {
TokenCollectedEvent tokenCollectedEvent = (TokenCollectedEvent) event;
@@ -310,11 +310,12 @@
writeData(writer, serverDataModel, clientSpatialDistributionMap);
}
- private void writeData(
- PrintWriter writer,
- ServerDataModel serverDataModel,
- Map<Identifier, ClientSpatialDistribution> clientSpatialDistributionMap) {
- ArrayList<GroupDataModel> groups = new ArrayList<GroupDataModel>(serverDataModel.getGroups());
+ private void writeData(
+ PrintWriter writer,
+ ServerDataModel serverDataModel,
+ Map<Identifier, ClientSpatialDistribution> clientSpatialDistributionMap)
+ {
+ ArrayList<GroupDataModel> groups = new ArrayList<GroupDataModel>(serverDataModel.getGroups());
for (GroupDataModel group: groups) {
// String groupLabel = "Group # " + groups.indexOf(group);
String groupLabel = group.toString();
@@ -548,14 +549,16 @@
}
else if (event instanceof QuizResponseEvent) {
QuizResponseEvent response = (QuizResponseEvent) event;
- Identifier source = response.getId();
-
-
+ Identifier id = response.getId();
+ String line = String.format("%s, %s", savedRoundData.toSecondString(event), response.toString());
+ writer.println(line);
}
else if (event instanceof EnforcementRankingRequest) {
+ System.err.println("enforcement ranking request: " + event);
EnforcementRankingRequest request = (EnforcementRankingRequest) event;
Identifier id = request.getId();
- String line = String.format("%s, %s, %s, %s", savedRoundData.toSecondString(event), id, request.toString(), Arrays.asList(request.getRankings()));
+ String line = String.format("%s, %s", savedRoundData.toSecondString(event), request.toString());
+ writer.println(line);
}
else {
writer.println(String.format("%s, %s", savedRoundData.toSecondString(event), event.toString()));
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/IntervalChecker.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/MovieCreator.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/MovieCreatorProcessor.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/QuickTimeOutputStream.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Property changes on: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/VideoFormat.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Id
Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fullvision/round1.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fullvision/round1.xml 2010-06-29 16:08:12 UTC (rev 521)
+++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fullvision/round1.xml 2010-06-30 19:17:48 UTC (rev 522)
@@ -54,12 +54,8 @@
The other four players will appear on the screen as blue dots <img src="@CODEBASE_URL@/images/gem-other.gif"> with a white number embedded in the
dot. On the top right corner of the screen you can see how many tokens each
player has collected. On the top left corner of the screen you can see a clock
-that displays the remaining time in the round. Since you can only see the
-resource within your vision you may neither see all the other participants nor
-all the resource units. The figure below indicates the vision range compared
-to the whole environment
+that displays the remaining time in the round.
</p>
-<img src="@CODEBASE_URL@/images/vision-range.jpg">
<p><b>Do you have any questions so far?</b></p>
<p>
Before the next round starts you can anonymously communicate by text messages
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
