virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 17)
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
virtualcommons-svn — Virtual Commons source control (SVN/HG) commit traffic
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(21) |
Aug
(31) |
Sep
(6) |
Oct
(15) |
Nov
(2) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(4) |
Feb
(6) |
Mar
(12) |
Apr
(52) |
May
(14) |
Jun
(19) |
Jul
(81) |
Aug
(115) |
Sep
(36) |
Oct
(88) |
Nov
(46) |
Dec
(58) |
| 2010 |
Jan
(52) |
Feb
(55) |
Mar
(48) |
Apr
(15) |
May
(5) |
Jun
(38) |
Jul
(27) |
Aug
(24) |
Sep
(28) |
Oct
(1) |
Nov
(2) |
Dec
(29) |
| 2011 |
Jan
(87) |
Feb
(39) |
Mar
(63) |
Apr
(42) |
May
(26) |
Jun
(53) |
Jul
(23) |
Aug
(43) |
Sep
(37) |
Oct
(25) |
Nov
(4) |
Dec
(7) |
| 2012 |
Jan
(73) |
Feb
(79) |
Mar
(62) |
Apr
(28) |
May
(12) |
Jun
(2) |
Jul
(9) |
Aug
(1) |
Sep
(8) |
Oct
|
Nov
(3) |
Dec
(3) |
| 2013 |
Jan
(8) |
Feb
(16) |
Mar
(38) |
Apr
(74) |
May
(62) |
Jun
(15) |
Jul
(49) |
Aug
(19) |
Sep
(9) |
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Bitbucket <com...@bi...> - 2012-03-27 21:33:54
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/c5d95b9aeb85/ changeset: c5d95b9aeb85 user: alllee date: 2012-03-27 23:33:51 summary: displaying ClientData.toString() to include the priority string in facilitator debriefing affected #: 4 files diff -r b359e069f13fc35f081cbf1912034f15e4368b5a -r c5d95b9aeb85b2b3129952e1b4acb4d643c09801 src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -485,7 +485,7 @@ <table border=1 cellspacing=3 cellpadding=3><tr><th>Participant</th><th>Current tokens</th><th>Current income</th><th>Quiz earnings</th><th>Total income</th></tr> {clientDataList: {data | -<tr align="RIGHT"><td>{data.id}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> +<tr align="RIGHT"><td>{data}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> }} </table> {if (self.lastRound)} diff -r b359e069f13fc35f081cbf1912034f15e4368b5a -r c5d95b9aeb85b2b3129952e1b4acb4d643c09801 src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -485,7 +485,7 @@ <table border=1 cellspacing=3 cellpadding=3><tr><th>Participant</th><th>Current tokens</th><th>Current income</th><th>Quiz earnings</th><th>Total income</th></tr> {clientDataList: {data | -<tr align="RIGHT"><td>{data.id}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> +<tr align="RIGHT"><td>{data}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> }} </table> {if (self.lastRound)} diff -r b359e069f13fc35f081cbf1912034f15e4368b5a -r c5d95b9aeb85b2b3129952e1b4acb4d643c09801 src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -485,7 +485,7 @@ <table border=1 cellspacing=3 cellpadding=3><tr><th>Participant</th><th>Current tokens</th><th>Current income</th><th>Quiz earnings</th><th>Total income</th></tr> {clientDataList: {data | -<tr align="RIGHT"><td>{data.id}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> +<tr align="RIGHT"><td>{data}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> }} </table> {if (self.lastRound)} diff -r b359e069f13fc35f081cbf1912034f15e4368b5a -r c5d95b9aeb85b2b3129952e1b4acb4d643c09801 src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -485,7 +485,7 @@ <table border=1 cellspacing=3 cellpadding=3><tr><th>Participant</th><th>Current tokens</th><th>Current income</th><th>Quiz earnings</th><th>Total income</th></tr> {clientDataList: {data | -<tr align="RIGHT"><td>{data.id}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> +<tr align="RIGHT"><td>{data}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> }} </table> {if (self.lastRound)} Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 21:33:08
|
2 new commits in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/cccbf9276e86/ changeset: cccbf9276e86 user: alllee date: 2012-03-27 22:37:10 summary: merging off-by-one fix for issue 21 from stable into default and replacing station id + uid with just station id affected #: 6 files diff -r 0c4ced9932245edf82b2c89e01a5e7af8ced741a -r cccbf9276e86e63345ebb0408726cf0d0a19de3f src/main/java/edu/asu/commons/irrigation/events/QuizResponseEvent.java --- a/src/main/java/edu/asu/commons/irrigation/events/QuizResponseEvent.java +++ b/src/main/java/edu/asu/commons/irrigation/events/QuizResponseEvent.java @@ -44,6 +44,6 @@ } public int getNumberOfCorrectQuizAnswers() { - return responses.size() - 1 - getIncorrectAnswers().size(); + return responses.size() - getIncorrectAnswers().size(); } } diff -r 0c4ced9932245edf82b2c89e01a5e7af8ced741a -r cccbf9276e86e63345ebb0408726cf0d0a19de3f src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -408,11 +408,11 @@ <p> This was the last round, but not the end of the experiment. We ask that you please carefully fill out a brief survey as we prepare your payments. </p> - <h2>Payment</h2> + <h2>Payment for Computer Number {clientData.id.stationId}</h2><hr><p> When payments are ready we will call you up one by one. Please wait until - your computer number, <b>{clientData.id}</b>, is called to turn in your + your computer number, <b>{clientData.id.stationId}</b>, is called to turn in your survey and receive payment. NOTE: Please <b>answer the survey completely (there may be a back side)</b> and <b>bring all your belongings with you</b> when you come up to receive diff -r 0c4ced9932245edf82b2c89e01a5e7af8ced741a -r cccbf9276e86e63345ebb0408726cf0d0a19de3f src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -408,11 +408,11 @@ <p> This was the last round, but not the end of the experiment. We ask that you please carefully fill out a brief survey as we prepare your payments. </p> - <h2>Payment</h2> + <h2>Payment for Computer Number {clientData.id.stationId}</h2><hr><p> When payments are ready we will call you up one by one. Please wait until - your computer number, <b>{clientData.id}</b>, is called to turn in your + your computer number, <b>{clientData.id.stationId}</b>, is called to turn in your survey and receive payment. NOTE: Please <b>answer the survey completely (there may be a back side)</b> and <b>bring all your belongings with you</b> when you come up to receive diff -r 0c4ced9932245edf82b2c89e01a5e7af8ced741a -r cccbf9276e86e63345ebb0408726cf0d0a19de3f src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -408,11 +408,11 @@ <p> This was the last round, but not the end of the experiment. We ask that you please carefully fill out a brief survey as we prepare your payments. </p> - <h2>Payment</h2> + <h2>Payment for Computer Number {clientData.id.stationId}</h2><hr><p> When payments are ready we will call you up one by one. Please wait until - your computer number, <b>{clientData.id}</b>, is called to turn in your + your computer number, <b>{clientData.id.stationId}</b>, is called to turn in your survey and receive payment. NOTE: Please <b>answer the survey completely (there may be a back side)</b> and <b>bring all your belongings with you</b> when you come up to receive diff -r 0c4ced9932245edf82b2c89e01a5e7af8ced741a -r cccbf9276e86e63345ebb0408726cf0d0a19de3f src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -408,11 +408,11 @@ <p> This was the last round, but not the end of the experiment. We ask that you please carefully fill out a brief survey as we prepare your payments. </p> - <h2>Payment</h2> + <h2>Payment for Computer Number {clientData.id.stationId}</h2><hr><p> When payments are ready we will call you up one by one. Please wait until - your computer number, <b>{clientData.id}</b>, is called to turn in your + your computer number, <b>{clientData.id.stationId}</b>, is called to turn in your survey and receive payment. NOTE: Please <b>answer the survey completely (there may be a back side)</b> and <b>bring all your belongings with you</b> when you come up to receive diff -r 0c4ced9932245edf82b2c89e01a5e7af8ced741a -r cccbf9276e86e63345ebb0408726cf0d0a19de3f src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -408,11 +408,11 @@ <p> This was the last round, but not the end of the experiment. We ask that you please carefully fill out a brief survey as we prepare your payments. </p> - <h2>Payment</h2> + <h2>Payment for Computer Number {clientData.id.stationId}</h2><hr><p> When payments are ready we will call you up one by one. Please wait until - your computer number, <b>{clientData.id}</b>, is called to turn in your + your computer number, <b>{clientData.id.stationId}</b>, is called to turn in your survey and receive payment. NOTE: Please <b>answer the survey completely (there may be a back side)</b> and <b>bring all your belongings with you</b> when you come up to receive https://bitbucket.org/virtualcommons/irrigation/changeset/b359e069f13f/ changeset: b359e069f13f user: alllee date: 2012-03-27 23:33:06 summary: fixes issue 22 and fixes issue 20 affected #: 5 files diff -r cccbf9276e86e63345ebb0408726cf0d0a19de3f -r b359e069f13fc35f081cbf1912034f15e4368b5a ivy.xml --- a/ivy.xml +++ b/ivy.xml @@ -7,5 +7,6 @@ <dependencies><dependency org="edu.asu.commons" name="csidex" rev="0.5-SNAPSHOT"/><dependency org="org.jfree" name="jfreechart" rev="1.0.14"/> + <dependency org="javax.jnlp" name="javaws" rev="1.6.0_30"/></dependencies></ivy-module> diff -r cccbf9276e86e63345ebb0408726cf0d0a19de3f -r b359e069f13fc35f081cbf1912034f15e4368b5a pom.xml --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,12 @@ <artifactId>forms</artifactId><version>1.1.0</version></dependency> + <dependency> + <groupId>javax.jnlp</groupId> + <artifactId>javaws</artifactId> + <version>1.6.0_30</version> + <scope>provided</scope> + </dependency></dependencies><build><finalName>irrigation</finalName> diff -r cccbf9276e86e63345ebb0408726cf0d0a19de3f -r b359e069f13fc35f081cbf1912034f15e4368b5a src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java --- a/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java +++ b/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java @@ -9,6 +9,7 @@ import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSplitPane; @@ -21,6 +22,7 @@ import edu.asu.commons.irrigation.events.ShowGameScreenshotRequest; import edu.asu.commons.irrigation.events.ShowQuizRequest; import edu.asu.commons.ui.HtmlEditorPane; +import edu.asu.commons.ui.HtmlSelection; import edu.asu.commons.ui.UserInterfaceUtils; /** @@ -59,6 +61,8 @@ private JButton stopRoundButton; + private JButton copyToClipboardButton; + /** * This is the default constructor */ @@ -81,6 +85,7 @@ addToBoxLayout(buttonPanel, getShowQuizButton()); addToBoxLayout(buttonPanel, getStartRoundOverrideButton()); addToBoxLayout(buttonPanel, getStopRoundButton()); + addToBoxLayout(buttonPanel, getCopyToClipboardButton()); add(buttonPanel, BorderLayout.NORTH); informationEditorPane = UserInterfaceUtils.createInstructionsEditorPane(); informationScrollPane = new JScrollPane(informationEditorPane); @@ -104,6 +109,36 @@ splitPane.setResizeWeight(proportion); } + private JButton getCopyToClipboardButton() { + // create copy to clipboard menu item + if (copyToClipboardButton == null) { + copyToClipboardButton = new JButton("Copy to clipboard"); + copyToClipboardButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + String text = informationEditorPane.getSelectedText(); + if (text == null || text.trim().isEmpty()) { + addMessage("No text selected, copying all text in the editor pane to the clipboard."); + text = informationEditorPane.getText(); + if (text == null || text.trim().isEmpty()) { + // if text is still empty, give up + JOptionPane.showMessageDialog(FacilitatorWindow.this, "Unable to find any text to copy to the clipboard."); + return; + } + } + if (UserInterfaceUtils.getClipboardService() != null) { + HtmlSelection selection = new HtmlSelection(text); + UserInterfaceUtils.getClipboardService().setContents(selection); + } + else { + addMessage("Clipboard service is not available."); + } + } + }); + } + return copyToClipboardButton; + } + private void addToBoxLayout(JPanel buttonPanel, JButton button) { buttonPanel.add(button); buttonPanel.add(Box.createHorizontalStrut(5)); diff -r cccbf9276e86e63345ebb0408726cf0d0a19de3f -r b359e069f13fc35f081cbf1912034f15e4368b5a src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java --- a/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java +++ b/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java @@ -119,7 +119,7 @@ } // ignore the request if not every group has submit their tokens. if (isTokenInvestmentComplete()) { - sendFacilitatorMessage("Starting round."); + sendFacilitatorMessage("Starting actual round."); synchronized (roundSignal) { roundSignal.notifyAll(); } @@ -274,7 +274,7 @@ private volatile int numberOfCompletedQuizzes = 0; @Override public void handle(QuizResponseEvent quizResponseEvent) { - sendFacilitatorMessage("Received quiz response: " + quizResponseEvent); + sendFacilitatorMessage(String.format("%d/%d quiz response: %s", numberOfCompletedQuizzes, clients.size(), quizResponseEvent)); clients.get(quizResponseEvent.getId()).addCorrectQuizAnswers(quizResponseEvent.getNumberOfCorrectQuizAnswers()); numberOfCompletedQuizzes++; if (numberOfCompletedQuizzes >= clients.size()) { @@ -443,6 +443,7 @@ getConfiguration().isLastRound())); } } + sendFacilitatorMessage("Round ended, ready to begin chat again"); transmit(new FacilitatorEndRoundEvent(getFacilitatorId(), serverDataModel)); } diff -r cccbf9276e86e63345ebb0408726cf0d0a19de3f -r b359e069f13fc35f081cbf1912034f15e4368b5a src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -485,7 +485,7 @@ <table border=1 cellspacing=3 cellpadding=3><tr><th>Participant</th><th>Current tokens</th><th>Current income</th><th>Quiz earnings</th><th>Total income</th></tr> {clientDataList: {data | -<tr align="RIGHT"><td>{data.id}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> +<tr align="RIGHT"><td>{data}</td><td>{data.allTokensEarnedThisRound}</td><td>{data.totalDollarsEarnedThisRound}</td><td>{data.quizEarnings}</td><td>{data.grandTotalIncome}</td></tr> }} </table> {if (self.lastRound)} Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 17:16:42
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/4e044b944d4a/ changeset: 4e044b944d4a branch: stable user: alllee date: 2012-03-27 19:16:23 summary: fixes issue 21 stupid off-by-one error affected #: 1 file diff -r 470fdcaacb7ffaf974c9849a6172136b8ed836ba -r 4e044b944d4a03c4b0089891fa10b18b76fe69d0 src/main/java/edu/asu/commons/irrigation/events/QuizResponseEvent.java --- a/src/main/java/edu/asu/commons/irrigation/events/QuizResponseEvent.java +++ b/src/main/java/edu/asu/commons/irrigation/events/QuizResponseEvent.java @@ -44,6 +44,6 @@ } public int getNumberOfCorrectQuizAnswers() { - return responses.size() - 1 - getIncorrectAnswers().size(); + return responses.size() - getIncorrectAnswers().size(); } } Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 07:15:21
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/0c4ced993224/ changeset: 0c4ced993224 user: alllee date: 2012-03-27 09:15:19 summary: convert build target improvements affected #: 1 file diff -r 80c30fda2da616dbf2f5904a0689919231547f1a -r 0c4ced9932245edf82b2c89e01a5e7af8ced741a build.xml --- a/build.xml +++ b/build.xml @@ -338,10 +338,12 @@ </junit></target> - <property name='savefile.converter.class' value='edu.asu.commons.irrigation.util.SaveFileConverter'/> - <target name='convert-savefiles' depends='compile'> + <property name='savefile.converter.class' value='edu.asu.commons.irrigation.data.IrrigationSaveFileConverter'/> + <!-- default savefile directory is the raw-data directory --> + <property name="savefile.dir" value="raw-data"/> + <target name='convert' depends='compile'><java classname='${savefile.converter.class}' classpathref='project.classpath' fork='yes'> - <arg value='raw-data'/> + <arg value='${savefile.dir}'/></java></target> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 07:14:46
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/470fdcaacb7f/ changeset: 470fdcaacb7f branch: stable user: alllee date: 2012-03-27 09:14:22 summary: updating convert build target affected #: 1 file diff -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 -r 470fdcaacb7ffaf974c9849a6172136b8ed836ba build.xml --- a/build.xml +++ b/build.xml @@ -338,10 +338,12 @@ </junit></target> - <property name='savefile.converter.class' value='edu.asu.commons.irrigation.util.SaveFileConverter'/> - <target name='convert-savefiles' depends='compile'> + <property name='savefile.converter.class' value='edu.asu.commons.irrigation.data.IrrigationSaveFileConverter'/> + <!-- default savefile directory is the raw-data directory --> + <property name="savefile.dir" value="raw-data"/> + <target name='convert' depends='compile'><java classname='${savefile.converter.class}' classpathref='project.classpath' fork='yes'> - <arg value='raw-data'/> + <arg value='${savefile.dir}'/></java></target> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 05:20:00
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/8b3f4d027b4d/ changeset: 8b3f4d027b4d branch: stable user: alllee date: 2012-03-27 07:19:59 summary: final default->stable merge before first irrigation experiment of the season, minor fixes to chat panel and instructions affected #: 9 files diff -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java --- a/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java +++ b/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java @@ -64,8 +64,7 @@ public void handle(final ChatEvent chatEvent) { SwingUtilities.invokeLater(new Runnable() { public void run() { - displayMessage(getChatHandle(chatEvent.getSource()), - chatEvent.toString()); + displayMessage(getChatHandle(chatEvent.getSource()), chatEvent.toString()); } }); } @@ -88,12 +87,6 @@ } } }); -// final JButton sendButton = new JButton("Send"); -// sendButton.addActionListener(new ActionListener() { -// public void actionPerformed(ActionEvent event) { -// sendMessage(); -// } -// }); JPanel timeLeftPanel = new JPanel(); int chatDuration = irrigationClient.getServerConfiguration().getChatDuration(); timeLeftProgressBar = new JProgressBar(0, chatDuration); @@ -109,7 +102,7 @@ private void sendMessage() { String message = chatField.getText(); if (message != null && ! message.isEmpty() && targetIdentifier != null) { - displayMessage(getChatHandle(getClientId()), message); + displayMessage(getChatHandle(getClientId()) + " (you): ", message); chatField.setText(""); irrigationClient.transmit(new ChatRequest(getClientId(), message, targetIdentifier)); } @@ -181,7 +174,7 @@ public void displayMessage(String chatHandle, String message) { final StyledDocument document = messageWindow.getStyledDocument(); - if (!chatHandle.endsWith(":")) { + if (!chatHandle.trim().endsWith(":")) { chatHandle = chatHandle.concat(": "); } try { diff -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java --- a/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java +++ b/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java @@ -271,6 +271,8 @@ public synchronized void actionPerformed(ActionEvent e) { FormActionEvent formEvent = (FormActionEvent) e; Properties actualAnswers = formEvent.getData(); + // remove the submit button if it exists + actualAnswers.remove("submit"); System.err.println("actual answers: " + actualAnswers); List<String> incorrectQuestionNumbers = new ArrayList<String>(); List<String> correctQuestionNumbers = new ArrayList<String>(); diff -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -269,7 +269,7 @@ public String getQuizResults(List<String> incorrectQuestionNumbers, Map<Object, Object> actualAnswers) { ST template = createStringTemplate(getProperty("quiz-results")); // FIXME: actual answers includes the submit button, so there's an off-by-one that we need to deal with. - int totalQuestions = actualAnswers.size() - 1; + int totalQuestions = actualAnswers.size(); int numberCorrect = totalQuestions - incorrectQuestionNumbers.size(); template.add("allCorrect", incorrectQuestionNumbers.isEmpty()); template.add("numberCorrect", numberCorrect); diff -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java --- a/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java +++ b/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java @@ -249,7 +249,7 @@ ChatEvent chatEvent = new ChatEvent(target, request.getMessage(), source); transmit(chatEvent); } - sendFacilitatorMessage(String.format("%s->%s: %s", source, allTargets, request.toString())); + sendFacilitatorMessage(String.format("%s->%s: %s", sendingClient, allTargets, request.toString())); persister.store(request); } }); diff -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> diff -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> diff -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> diff -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> diff -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa -r 8b3f4d027b4d38e16d05e1cae9fb668db680d928 src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 04:57:48
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/80c30fda2da6/ changeset: 80c30fda2da6 user: alllee date: 2012-03-27 06:57:49 summary: silly formatting conditionals affected #: 1 file diff -r 7a6ee5861581c767451831f5a813eda80a386fc1 -r 80c30fda2da616dbf2f5904a0689919231547f1a src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java --- a/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java +++ b/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java @@ -174,7 +174,7 @@ public void displayMessage(String chatHandle, String message) { final StyledDocument document = messageWindow.getStyledDocument(); - if (!chatHandle.endsWith(":")) { + if (!chatHandle.trim().endsWith(":")) { chatHandle = chatHandle.concat(": "); } try { Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 04:44:10
|
2 new commits in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/f121d6e8cec5/ changeset: f121d6e8cec5 user: alllee date: 2012-03-27 06:38:14 summary: adding an extra space for consistency to chat handle affected #: 1 file diff -r 089f49b2f359c6ee92405e85778505702f962adf -r f121d6e8cec5053095aaecfeba55bf30ef4bbb8e src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java --- a/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java +++ b/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java @@ -102,7 +102,7 @@ private void sendMessage() { String message = chatField.getText(); if (message != null && ! message.isEmpty() && targetIdentifier != null) { - displayMessage(getChatHandle(getClientId()) + " (you):", message); + displayMessage(getChatHandle(getClientId()) + " (you): ", message); chatField.setText(""); irrigationClient.transmit(new ChatRequest(getClientId(), message, targetIdentifier)); } https://bitbucket.org/virtualcommons/irrigation/changeset/7a6ee5861581/ changeset: 7a6ee5861581 user: alllee date: 2012-03-27 06:44:07 summary: getting rid of off-by-one by removing submit button from form data if it exists affected #: 2 files diff -r f121d6e8cec5053095aaecfeba55bf30ef4bbb8e -r 7a6ee5861581c767451831f5a813eda80a386fc1 src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java --- a/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java +++ b/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java @@ -271,6 +271,8 @@ public synchronized void actionPerformed(ActionEvent e) { FormActionEvent formEvent = (FormActionEvent) e; Properties actualAnswers = formEvent.getData(); + // remove the submit button if it exists + actualAnswers.remove("submit"); System.err.println("actual answers: " + actualAnswers); List<String> incorrectQuestionNumbers = new ArrayList<String>(); List<String> correctQuestionNumbers = new ArrayList<String>(); diff -r f121d6e8cec5053095aaecfeba55bf30ef4bbb8e -r 7a6ee5861581c767451831f5a813eda80a386fc1 src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -269,7 +269,7 @@ public String getQuizResults(List<String> incorrectQuestionNumbers, Map<Object, Object> actualAnswers) { ST template = createStringTemplate(getProperty("quiz-results")); // FIXME: actual answers includes the submit button, so there's an off-by-one that we need to deal with. - int totalQuestions = actualAnswers.size() - 1; + int totalQuestions = actualAnswers.size(); int numberCorrect = totalQuestions - incorrectQuestionNumbers.size(); template.add("allCorrect", incorrectQuestionNumbers.isEmpty()); template.add("numberCorrect", numberCorrect); Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 04:31:55
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/089f49b2f359/ changeset: 089f49b2f359 user: alllee date: 2012-03-27 06:31:53 summary: minor instruction tweaks affected #: 5 files diff -r 97848317c45589cef63637848d843bd4172bd5e4 -r 089f49b2f359c6ee92405e85778505702f962adf src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> diff -r 97848317c45589cef63637848d843bd4172bd5e4 -r 089f49b2f359c6ee92405e85778505702f962adf src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> diff -r 97848317c45589cef63637848d843bd4172bd5e4 -r 089f49b2f359c6ee92405e85778505702f962adf src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> diff -r 97848317c45589cef63637848d843bd4172bd5e4 -r 089f49b2f359c6ee92405e85778505702f962adf src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> diff -r 97848317c45589cef63637848d843bd4172bd5e4 -r 089f49b2f359c6ee92405e85778505702f962adf src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -83,15 +83,13 @@ <h2>How to participate</h2><hr><p> -This exercise mimics decisions people make in irrigation systems. In each round you -will receive {self.tokenEndowment} tokens which you can invest in the irrigation -infrastructure. Based on the <b>water delivery capacity</b> of the irrigation -infrastructure and the availability of water you will be able to grow crops. Tokens -earned in a round is the sum of tokens not invested plus tokens earned by growing -crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to -invest in the irrigation infrastructure. Based on the combined contributions of all -5 participants in your group in each round, your group can maintain the capacity of -the irrigation infrastructure for growing crops. +This exercise mimics decisions people make in irrigation systems. In each round you will receive {self.tokenEndowment} +tokens. You can choose to invest in the irrigation infrastructure or keep the tokens. Based on the <b>water delivery +capacity</b> of the irrigation infrastructure and the availability of water you will be able to grow crops. The total +number of tokens you can earn in a round is the sum of your tokens not invested plus the tokens you earn from growing +crops. Each token is worth {dollarsPerToken}. In each round you will first decide how much to invest in the irrigation +infrastructure. Based on the combined contributions of all 5 participants in your group in each round, your group can +maintain the capacity of the irrigation infrastructure for growing crops. </p><p> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 04:23:37
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/97848317c455/ changeset: 97848317c455 user: alllee date: 2012-03-27 06:23:34 summary: updating chat handles to specify (you) for messages sent by the given participant affected #: 2 files diff -r ea63fc72a481f3db108fd5be318c79fb3a96b02a -r 97848317c45589cef63637848d843bd4172bd5e4 src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java --- a/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java +++ b/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java @@ -64,8 +64,7 @@ public void handle(final ChatEvent chatEvent) { SwingUtilities.invokeLater(new Runnable() { public void run() { - displayMessage(getChatHandle(chatEvent.getSource()), - chatEvent.toString()); + displayMessage(getChatHandle(chatEvent.getSource()), chatEvent.toString()); } }); } @@ -88,12 +87,6 @@ } } }); -// final JButton sendButton = new JButton("Send"); -// sendButton.addActionListener(new ActionListener() { -// public void actionPerformed(ActionEvent event) { -// sendMessage(); -// } -// }); JPanel timeLeftPanel = new JPanel(); int chatDuration = irrigationClient.getServerConfiguration().getChatDuration(); timeLeftProgressBar = new JProgressBar(0, chatDuration); @@ -109,7 +102,7 @@ private void sendMessage() { String message = chatField.getText(); if (message != null && ! message.isEmpty() && targetIdentifier != null) { - displayMessage(getChatHandle(getClientId()), message); + displayMessage(getChatHandle(getClientId()) + " (you):", message); chatField.setText(""); irrigationClient.transmit(new ChatRequest(getClientId(), message, targetIdentifier)); } diff -r ea63fc72a481f3db108fd5be318c79fb3a96b02a -r 97848317c45589cef63637848d843bd4172bd5e4 src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java --- a/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java +++ b/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java @@ -249,7 +249,7 @@ ChatEvent chatEvent = new ChatEvent(target, request.getMessage(), source); transmit(chatEvent); } - sendFacilitatorMessage(String.format("%s->%s: %s", source, allTargets, request.toString())); + sendFacilitatorMessage(String.format("%s->%s: %s", sendingClient, allTargets, request.toString())); persister.store(request); } }); Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 04:19:03
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/5bbb87c0ba61/ changeset: 5bbb87c0ba61 branch: stable user: alllee date: 2012-03-27 06:19:01 summary: huzzah for spuriously numerous branch merges. stable should finally be stable affected #: 1 file diff -r 46eb9a52d1c9766dee5d38efdaedbb4498627bb9 -r 5bbb87c0ba61aa9867b70669ace58a69054af9fa src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java --- a/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java +++ b/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java @@ -230,7 +230,7 @@ */ public void endRound(FacilitatorEndRoundEvent event) { // reset the StringBuilder as it will be appended to - builder = new StringBuilder(event.getServerDataModel()); + builder = new StringBuilder(event.getServerDataModel().generateFacilitatorDebriefing()); setInstructions(builder.toString()); } Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 04:18:33
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/ea63fc72a481/ changeset: ea63fc72a481 user: alllee date: 2012-03-27 06:18:32 summary: fixing silly compilation bug, the perils of vim vs eclipse affected #: 1 file diff -r 84c80035380057ce82f6721fe9abd586442f490c -r ea63fc72a481f3db108fd5be318c79fb3a96b02a src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java --- a/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java +++ b/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java @@ -230,7 +230,7 @@ */ public void endRound(FacilitatorEndRoundEvent event) { // reset the StringBuilder as it will be appended to - builder = new StringBuilder(event.getServerDataModel()); + builder = new StringBuilder(event.getServerDataModel().generateFacilitatorDebriefing()); setInstructions(builder.toString()); } Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 04:16:10
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/84c800353800/ changeset: 84c800353800 user: alllee date: 2012-03-27 06:16:11 summary: bugfixes from stable affected #: 2 files diff -r 1dd76dc525351d2433fc0a3e9459575cdea10dd3 -r 84c80035380057ce82f6721fe9abd586442f490c src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java --- a/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java +++ b/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java @@ -229,7 +229,9 @@ * @param event */ public void endRound(FacilitatorEndRoundEvent event) { - setInstructions(event.getServerDataModel().generateFacilitatorDebriefing()); + // reset the StringBuilder as it will be appended to + builder = new StringBuilder(event.getServerDataModel()); + setInstructions(builder.toString()); } public void addInstructions(String instructions) { diff -r 1dd76dc525351d2433fc0a3e9459575cdea10dd3 -r 84c80035380057ce82f6721fe9abd586442f490c src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java --- a/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java +++ b/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java @@ -228,28 +228,28 @@ Identifier source = request.getSource(); Identifier target = request.getTarget(); ClientData sendingClient = clients.get(source); + ArrayList<ClientData> allTargets = new ArrayList<ClientData>(); if (Identifier.ALL.equals(target)) { // relay to all clients in this client's group. - sendFacilitatorMessage(String.format("%s -> ALL: [ %s ]", request.getSource(), request)); boolean restrictedVisibility = getRoundConfiguration().isRestrictedVisibility(); for (ClientData clientData: clients.get(source).getGroupDataModel().getClientDataMap().values()) { Identifier targetId = clientData.getId(); - if (targetId.equals(source)) { + if (targetId.equals(source) || (restrictedVisibility && ! sendingClient.isImmediateNeighbor(clientData))) { + // don't send the message if the target is the source or we're in a restricted visibility + // condition and the client isn't an immediate neighbor. continue; } - if (restrictedVisibility && ! sendingClient.isImmediateNeighbor(clientData)) { - sendFacilitatorMessage(String.format("%s was out of range of %s, not sending message [%s]", clientData, sendingClient, request.getMessage())); - continue; - } + allTargets.add(clientData); ChatEvent chatEvent = new ChatEvent(targetId, request.getMessage(), source, true); transmit(chatEvent); } } else { - sendFacilitatorMessage(String.format("%s->%s: [%s]", request.getSource(), request.getTarget(), request.toString())); - ChatEvent chatEvent = new ChatEvent(request.getTarget(), request.getMessage(), request.getSource()); + allTargets.add(clients.get(target)); + ChatEvent chatEvent = new ChatEvent(target, request.getMessage(), source); transmit(chatEvent); } + sendFacilitatorMessage(String.format("%s->%s: %s", source, allTargets, request.toString())); persister.store(request); } }); Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 04:11:25
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/46eb9a52d1c9/ changeset: 46eb9a52d1c9 branch: stable user: alllee date: 2012-03-27 06:11:25 summary: sending target list in restricted visibility condition, fixing facilitator debriefing affected #: 2 files diff -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 -r 46eb9a52d1c9766dee5d38efdaedbb4498627bb9 src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java --- a/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java +++ b/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java @@ -229,7 +229,9 @@ * @param event */ public void endRound(FacilitatorEndRoundEvent event) { - setInstructions(event.getServerDataModel().generateFacilitatorDebriefing()); + // reset the StringBuilder as it will be appended to + builder = new StringBuilder(event.getServerDataModel()); + setInstructions(builder.toString()); } public void addInstructions(String instructions) { diff -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 -r 46eb9a52d1c9766dee5d38efdaedbb4498627bb9 src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java --- a/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java +++ b/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java @@ -228,28 +228,28 @@ Identifier source = request.getSource(); Identifier target = request.getTarget(); ClientData sendingClient = clients.get(source); + ArrayList<ClientData> allTargets = new ArrayList<ClientData>(); if (Identifier.ALL.equals(target)) { // relay to all clients in this client's group. - sendFacilitatorMessage(String.format("%s -> ALL: [ %s ]", request.getSource(), request)); boolean restrictedVisibility = getRoundConfiguration().isRestrictedVisibility(); for (ClientData clientData: clients.get(source).getGroupDataModel().getClientDataMap().values()) { Identifier targetId = clientData.getId(); - if (targetId.equals(source)) { + if (targetId.equals(source) || (restrictedVisibility && ! sendingClient.isImmediateNeighbor(clientData))) { + // don't send the message if the target is the source or we're in a restricted visibility + // condition and the client isn't an immediate neighbor. continue; } - if (restrictedVisibility && ! sendingClient.isImmediateNeighbor(clientData)) { - sendFacilitatorMessage(String.format("%s was out of range of %s, not sending message [%s]", clientData, sendingClient, request.getMessage())); - continue; - } + allTargets.add(clientData); ChatEvent chatEvent = new ChatEvent(targetId, request.getMessage(), source, true); transmit(chatEvent); } } else { - sendFacilitatorMessage(String.format("%s->%s: [%s]", request.getSource(), request.getTarget(), request.toString())); - ChatEvent chatEvent = new ChatEvent(request.getTarget(), request.getMessage(), request.getSource()); + allTargets.add(clients.get(target)); + ChatEvent chatEvent = new ChatEvent(target, request.getMessage(), source); transmit(chatEvent); } + sendFacilitatorMessage(String.format("%s->%s: %s", source, allTargets, request.toString())); persister.store(request); } }); Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 03:57:06
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/0c1a63e38a60/ changeset: 0c1a63e38a60 branch: stable user: alllee date: 2012-03-27 05:57:05 summary: merging bugfixes from default affected #: 6 files diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -82,13 +82,17 @@ return getDoubleProperty("showup-payment", 5.0d); } + public double getMaximumPayment() { + return getDoubleProperty("maximum-payment", 40.0d); + } + public String getInitialInstructions() { ST template = createStringTemplate(getProperty("initial-instructions")); - template.groupThatCreatedThisInstance.registerRenderer(Number.class, new NumberRenderer()); NumberFormat formatter = NumberFormat.getCurrencyInstance(); template.add("showUpPayment", formatter.format(getShowUpPayment())); template.add("dollarsPerToken", formatter.format(getDollarsPerToken())); template.add("quizCorrectAnswerReward", formatter.format(getQuizCorrectAnswerReward())); + template.add("maximumPayment", formatter.format(getMaximumPayment())); return template.render(); } diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-27 03:56:43
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/1dd76dc52535/ changeset: 1dd76dc52535 user: alllee date: 2012-03-27 05:56:41 summary: adding maximumPayment as a configuration parameter, specifying round-duration explicitly in server configuration affected #: 6 files diff -r c3913959c96218a3ab8ae3eccff6272372b4679d -r 1dd76dc525351d2433fc0a3e9459575cdea10dd3 src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -82,13 +82,17 @@ return getDoubleProperty("showup-payment", 5.0d); } + public double getMaximumPayment() { + return getDoubleProperty("maximum-payment", 40.0d); + } + public String getInitialInstructions() { ST template = createStringTemplate(getProperty("initial-instructions")); - template.groupThatCreatedThisInstance.registerRenderer(Number.class, new NumberRenderer()); NumberFormat formatter = NumberFormat.getCurrencyInstance(); template.add("showUpPayment", formatter.format(getShowUpPayment())); template.add("dollarsPerToken", formatter.format(getDollarsPerToken())); template.add("quizCorrectAnswerReward", formatter.format(getQuizCorrectAnswerReward())); + template.add("maximumPayment", formatter.format(getMaximumPayment())); return template.render(); } diff -r c3913959c96218a3ab8ae3eccff6272372b4679d -r 1dd76dc525351d2433fc0a3e9459575cdea10dd3 src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. diff -r c3913959c96218a3ab8ae3eccff6272372b4679d -r 1dd76dc525351d2433fc0a3e9459575cdea10dd3 src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. diff -r c3913959c96218a3ab8ae3eccff6272372b4679d -r 1dd76dc525351d2433fc0a3e9459575cdea10dd3 src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. diff -r c3913959c96218a3ab8ae3eccff6272372b4679d -r 1dd76dc525351d2433fc0a3e9459575cdea10dd3 src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. diff -r c3913959c96218a3ab8ae3eccff6272372b4679d -r 1dd76dc525351d2433fc0a3e9459575cdea10dd3 src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, by participating in this experiment which will take about an hour to an hour and a half. The amount of money you earn depends on your decisions AND the decisions of other people in this room over the course of the experiment. Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-26 20:39:21
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/c91e6ae4c27a/ changeset: c91e6ae4c27a branch: stable user: alllee date: 2012-03-26 22:39:19 summary: merging default back into stable for the first experiment run of the season affected #: 118 files Diff too large to display. Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-26 20:30:32
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/c3913959c962/ changeset: c3913959c962 user: alllee date: 2012-03-26 22:30:31 summary: minor instructions formatting fixes and facilitator UI tweaks, adding small spacing between buttons affected #: 10 files diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java --- a/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java +++ b/src/main/java/edu/asu/commons/irrigation/client/ChatPanel.java @@ -218,10 +218,8 @@ @Override public void focusGained(FocusEvent e) { if (e.getComponent().equals(chatField)) { - System.err.println("chat field got focus, not setting focus again"); return; } - System.err.println("gained focus, setting on chat field: " + e); chatField.requestFocusInWindow(); } diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java @@ -13,9 +13,9 @@ /** * $Id$ * - * Configuration parameters for a given round in the irrigation experiment. - * Provides reward functions, etc. - * + * Configuration parameters for a given round in the irrigation experiment. + * Provides reward functions, etc. + * * @author <a href='mailto:All...@as...'>Allen Lee</a> * @version $Rev$ */ @@ -47,13 +47,14 @@ public int getMaximumTokenInvestment() { return getIntProperty("max-token-investment", 10); } - + public int getTokenEndowment() { return getIntProperty("token-endowment"); } /** * returns maximum number of tokens that could have been contributed + * * @return */ public int getMaximumTotalInvestedTokens() { @@ -67,26 +68,26 @@ public boolean isPracticeRound() { return getBooleanProperty("practice-round"); } - + public String getPracticeRoundPaymentInstructions() { - return getProperty("practice-round-payment-instructions", + return getProperty("practice-round-payment-instructions", "This was a practice round so the earnings mentioned are only for illustrative purposes and <b>do not count towards your actual earnings</b>."); } - + public int getClientsPerGroup() { return getIntProperty("clients-per-group", 5); } /** - * Returns the dollars/token exchange rate. $1 = 1, 50 cents = $.50, 1 penny per token = .01, etc. + * Returns the dollars/token exchange rate. $1 = 1, 50 cents = $.50, 1 penny per token = .01, etc. * * FIXME: this should be a ServerConfiguration parameter unless we change it so - * the client keeps track of total dollars earned per round instead of total tokens earned per round. + * the client keeps track of total dollars earned per round instead of total tokens earned per round. * * @return */ public double getDollarsPerToken() { - return getDoubleProperty("dollars-per-token"); + return getDoubleProperty("dollars-per-token"); } /** @@ -95,13 +96,13 @@ public void report() { getProperties().list(System.err); } - + public boolean isInfrastructureEfficiencyReset() { - return isFirstRound() || getBooleanProperty("reset-infrastructure-efficiency", false); + return isFirstRound() || getBooleanProperty("reset-infrastructure-efficiency", false); } /** - * Returns the instructions for this round. If undefined at the round level it uses default instructions at the parent ServerConfiguration level. + * Returns the instructions for this round. If undefined at the round level it uses default instructions at the parent ServerConfiguration level. */ public String getInstructions() { ST template = createStringTemplate(getProperty("instructions", getParentConfiguration().getSameAsPreviousRoundInstructions())); @@ -112,8 +113,9 @@ } /** - * FIXME: convoluted flow of control; specialInstructions is set by generateUpdatedInstructions before invoking getInstructions(). This means - * that showInstructions will never + * FIXME: convoluted flow of control; specialInstructions is set by generateUpdatedInstructions before invoking getInstructions(). This means + * that showInstructions will never + * * @return */ public String getSpecialInstructions() { @@ -143,15 +145,15 @@ } /** - * Returns the duration of the round in seconds. Set to default of 50 seconds per round. + * Returns the duration of the round in seconds. Set to default of 50 seconds per round. */ @Override public Duration getRoundDuration() { return Duration.create(getRoundDurationInSeconds()); } - + public int getRoundDurationInSeconds() { - return getIntProperty("round-duration", 50); + return getIntProperty("round-duration"); } public boolean shouldRandomizeGroup() { @@ -161,20 +163,21 @@ public boolean isRestrictedVisibility() { return getFieldOfVision() > 0; } - + /** - * Returns the number of neighbors visible on both sides of the participant. A negative value signifies that + * Returns the number of neighbors visible on both sides of the participant. A negative value signifies that * participants can see everything. + * * @return the number of neighbors visible to either side of each participant. */ public int getFieldOfVision() { return getIntProperty("field-of-vision", getParentConfiguration().getFieldOfVision()); } - + public String getClientDebriefingTemplate() { return getProperty("client-debriefing"); } - + private void populateClientEarnings(ClientData data, ServerConfiguration serverConfiguration, NumberFormat currencyFormatter) { data.setGrandTotalIncome(currencyFormatter.format(serverConfiguration.getTotalIncome(data))); data.setTotalDollarsEarnedThisRound(currencyFormatter.format(serverConfiguration.getTokenEarningsThisRound(data))); @@ -184,7 +187,7 @@ public String generateClientDebriefing(ClientDataModel clientDataModel, boolean showExitInstructions) { ST st = createStringTemplate(getClientDebriefingTemplate()); NumberFormat formatter = NumberFormat.getCurrencyInstance(); - for (ClientData clientData: clientDataModel.getClientDataMap().values()) { + for (ClientData clientData : clientDataModel.getClientDataMap().values()) { populateClientEarnings(clientData, getParentConfiguration(), formatter); } st.add("clientData", clientDataModel.getClientData()); @@ -193,7 +196,7 @@ st.add("showExitInstructions", showExitInstructions); return st.render(); } - + public String generateContributionSummary(ClientData clientData) { ST st = createStringTemplate(getContributionSummaryTemplate()); st.add("clientData", clientData); @@ -204,11 +207,11 @@ private String getContributionSummaryTemplate() { return getProperty("contribution-summary"); } - + public int getChatDuration() { - return getIntProperty("chat-duration"); + return getIntProperty("chat-duration"); } - + public String getRestrictedVisibilityInstructions() { return render(getProperty("restricted-visibility-instructions")); } @@ -219,7 +222,7 @@ this.specialInstructions = specialInstructionsTemplate.render(); return getInstructions(); } - + private void populateInfrastructureEfficiencyAttributes(ClientDataModel clientDataModel, ST template) { int initialInfrastructureEfficiency = clientDataModel.getGroupDataModel().getInfrastructureEfficiency(); int actualInfrastructureEfficiency = initialInfrastructureEfficiency - getInfrastructureDegradationFactor(); @@ -231,7 +234,7 @@ template.add("initialInfrastructureEfficiency", initialInfrastructureEfficiency); template.add("actualInfrastructureEfficiency", actualInfrastructureEfficiency); template.add("waterDeliveryCapacity", waterDeliveryCapacity); - + } public String generateInvestmentInstructions(ClientDataModel clientDataModel) { @@ -244,7 +247,7 @@ ST template = createStringTemplate(getProperty("facilitator-debriefing")); ServerConfiguration serverConfiguration = getParentConfiguration(); NumberFormat formatter = NumberFormat.getCurrencyInstance(); - for (ClientData data: serverDataModel.getClientDataMap().values()) { + for (ClientData data : serverDataModel.getClientDataMap().values()) { populateClientEarnings(data, serverConfiguration, formatter); } template.add("clientDataList", serverDataModel.getClientDataMap().values()); diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -27,7 +27,7 @@ private static final String CONFIGURATION_FILE_NAME = "irrigation.xml"; private static final String DEFAULT_LOG_FILE_DESTINATION = "irrigation.log"; - + private static final double DEFAULT_DOLLARS_PER_TOKEN = 0.05d; public ServerConfiguration() { @@ -59,7 +59,7 @@ protected String getServerConfigurationFilename() { return CONFIGURATION_FILE_NAME; } - + private final static String[] PRIORITY_STRINGS = { "A", "B", "C", "D", "E" }; public static String toPriorityString(int clientPriority) { @@ -70,7 +70,7 @@ return "Position not found"; } - public boolean isUndisruptedFlowRequired(){ + public boolean isUndisruptedFlowRequired() { return getBooleanProperty("undisrupted-flow-required", false); } @@ -83,69 +83,70 @@ } public String getInitialInstructions() { - ST template = createStringTemplate(getProperty("initial-instructions")); - template.groupThatCreatedThisInstance.registerRenderer(Number.class, new NumberRenderer()); - NumberFormat formatter = NumberFormat.getCurrencyInstance(); - template.add("showUpPayment", formatter.format(getShowUpPayment())); + ST template = createStringTemplate(getProperty("initial-instructions")); + template.groupThatCreatedThisInstance.registerRenderer(Number.class, new NumberRenderer()); + NumberFormat formatter = NumberFormat.getCurrencyInstance(); + template.add("showUpPayment", formatter.format(getShowUpPayment())); template.add("dollarsPerToken", formatter.format(getDollarsPerToken())); template.add("quizCorrectAnswerReward", formatter.format(getQuizCorrectAnswerReward())); - return template.render(); + return template.render(); } - + public String getChatInstructions() { return render(getProperty("chat-instructions")); } - + public String getChatDurationInMinutes() { long minutes = inMinutes(getChatDuration()); return String.format("%d minute%s", minutes, (minutes > 1) ? "s" : ""); } - + public double getTotalIncome(ClientData data) { return getTotalTokenEarnings(data) + getShowUpPayment() + getQuizEarnings(data); } - + public double getTotalTokenEarnings(ClientData data) { return data.getTotalTokens() * getDollarsPerToken(); } - + public double getTokenEarningsThisRound(ClientData data) { return data.getAllTokensEarnedThisRound() * getDollarsPerToken(); } - + public double getQuizEarnings(ClientData data) { return data.getCorrectQuizAnswers() * getQuizCorrectAnswerReward(); } - + public String getRestrictedVisibilityInstructions() { return render(getProperty("restricted-visibility-instructions")); } - + public boolean isRestrictedVisibility() { return getFieldOfVision() > 0; } - + /** - * Returns the number of neighbors visible on both sides of the participant. A negative value signifies that + * Returns the number of neighbors visible on both sides of the participant. A negative value signifies that * participants can see everything. + * * @return the number of neighbors visible to either side of each participant. */ public int getFieldOfVision() { return getIntProperty("field-of-vision", -1); } - + public double getQuizCorrectAnswerReward() { return getDoubleProperty("quiz-correct-answer-reward", DEFAULT_QUIZ_CORRECT_ANSWER_REWARD); } - + public double getMaximumQuizEarnings() { return getQuizCorrectAnswerReward() * getNumberOfQuizQuestions(); } - + public String getWelcomeInstructions() { return getProperty("welcome-instructions"); } - + public int getNumberOfQuizQuestions() { return getIntProperty("numberOfQuizQuestions", 6); } @@ -160,39 +161,43 @@ } return answers; } - + public String getQuizQuestion(int pageNumber) { return getProperty("general-instructionsq" + pageNumber); } public String getQuizInstructions() { - return render(getProperty("quiz-instructions")); + return render(getProperty("quiz-instructions")); } - + public String getWaterCollectedToTokensTable() { - return getProperty("water-collected-to-tokens-table"); + return getProperty("water-collected-to-tokens-table"); } public String getFinalInstructions() { return getProperty("final-instructions", "<b>The experiment is now over. Thanks for participating!</b>"); } - + public String getInvestmentInstructions() { return render(getProperty("investment-instructions")); } - + public int getNumberOfQuizPages() { return getIntProperty("quiz-pages", 2); } - + public int getChatDuration() { return getIntProperty("chat-duration", 60); } + public int getRoundDuration() { + return getIntProperty("round-duration", 50); + } + public String getGameScreenshotInstructions() { return render(getProperty("game-screenshot-instructions")); } - + public String getSameAsPreviousRoundInstructions() { return getProperty("same-as-previous-round-instructions"); } @@ -204,57 +209,57 @@ public double getDollarsPerToken() { return getDoubleProperty("dollars-per-token", DEFAULT_DOLLARS_PER_TOKEN); } - + public int getTokenEndowment() { return getIntProperty("token-endowment", 10); } public static int getTokensEarned(int waterCollected) { - if (waterCollected < 150) { - return 0; - } - else if (waterCollected < 200) { - return 1; - } - else if (waterCollected < 250) { - return 4; - } - else if (waterCollected < 300) { - return 10; - } - else if (waterCollected < 350) { - return 15; - } - else if (waterCollected < 400) { - return 18; - } - else if (waterCollected < 500) { - return 19; - } - else if (waterCollected < 550) { - return 20; - } - else if (waterCollected < 650) { - return 19; - } - else if (waterCollected < 700) { - return 18; - } - else if (waterCollected < 750) { - return 15; - } - else if (waterCollected < 800) { - return 10; - } - else if (waterCollected < 850) { - return 4; - } - else if (waterCollected < 900) { - return 1; - } - else { - return 0; - } + if (waterCollected < 150) { + return 0; + } + else if (waterCollected < 200) { + return 1; + } + else if (waterCollected < 250) { + return 4; + } + else if (waterCollected < 300) { + return 10; + } + else if (waterCollected < 350) { + return 15; + } + else if (waterCollected < 400) { + return 18; + } + else if (waterCollected < 500) { + return 19; + } + else if (waterCollected < 550) { + return 20; + } + else if (waterCollected < 650) { + return 19; + } + else if (waterCollected < 700) { + return 18; + } + else if (waterCollected < 750) { + return 15; + } + else if (waterCollected < 800) { + return 10; + } + else if (waterCollected < 850) { + return 4; + } + else if (waterCollected < 900) { + return 1; + } + else { + return 0; + } } public String getQuizResults(List<String> incorrectQuestionNumbers, Map<Object, Object> actualAnswers) { diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/java/edu/asu/commons/irrigation/facilitator/Facilitator.java --- a/src/main/java/edu/asu/commons/irrigation/facilitator/Facilitator.java +++ b/src/main/java/edu/asu/commons/irrigation/facilitator/Facilitator.java @@ -19,7 +19,7 @@ /** * $Id$ * - * + * * @author <a href='mailto:All...@as...'>Allen Lee</a>, Sanket Joshi * @version $Rev$ */ @@ -27,7 +27,7 @@ private ServerDataModel serverDataModel; private FacilitatorWindow facilitatorWindow; - + private Facilitator() { this(new ServerConfiguration()); } @@ -35,10 +35,10 @@ public Facilitator(ServerConfiguration configuration) { super(configuration); } - + private void initializeEventProcessors() { - addEventProcessor(new EventTypeProcessor<RegistrationEvent>(RegistrationEvent.class) { - @Override + addEventProcessor(new EventTypeProcessor<RegistrationEvent>(RegistrationEvent.class) { + @Override public void handle(RegistrationEvent registrationEvent) { facilitatorWindow.addInstructions(registrationEvent.getRoundConfiguration().getInstructions()); } @@ -60,7 +60,7 @@ void initialize() { facilitatorWindow = new FacilitatorWindow(this); - facilitatorWindow.setText(getServerConfiguration().getFacilitatorInstructions()); + facilitatorWindow.setInstructions(getServerConfiguration().getFacilitatorInstructions()); initializeEventProcessors(); } @@ -79,14 +79,14 @@ SwingUtilities.invokeLater(createGuiRunnable); } - void sendStartRoundOverride(){ + void sendStartRoundOverride() { transmit(new BeginExperimentRequest(getId())); } /* * Send a request to start a round */ - public void sendBeginRoundRequest() { + public void sendBeginRoundRequest() { transmit(new BeginRoundRequest(getId())); } @@ -98,7 +98,7 @@ return facilitatorWindow; } - public ServerDataModel getServerDataModel(){ + public ServerDataModel getServerDataModel() { return serverDataModel; } diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java --- a/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java +++ b/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java @@ -5,6 +5,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JLabel; @@ -19,7 +20,6 @@ import edu.asu.commons.irrigation.events.FacilitatorEndRoundEvent; import edu.asu.commons.irrigation.events.ShowGameScreenshotRequest; import edu.asu.commons.irrigation.events.ShowQuizRequest; -import edu.asu.commons.irrigation.model.ServerDataModel; import edu.asu.commons.ui.HtmlEditorPane; import edu.asu.commons.ui.UserInterfaceUtils; @@ -27,7 +27,7 @@ * $Id$ * * Basic facilitator interface for driving the experiment. - * + * * @author <a href='mailto:All...@as...'>Allen Lee</a> * @version $Rev$ */ @@ -37,7 +37,7 @@ private Facilitator facilitator; - private JButton startRoundButton = null; + private JButton startRoundButton; private JButton beginChatButton; @@ -46,16 +46,19 @@ private JScrollPane informationScrollPane; private JButton showInstructionsButton; - + private JButton showQuizButton; - + private JButton showScreenshotButton; - -// private JButton displayInvestmentButton; - + + // private JButton displayInvestmentButton; + private StringBuilder builder = new StringBuilder(); - private JButton overrideButton; + private JButton overrideButton; + + private JButton stopRoundButton; + /** * This is the default constructor */ @@ -69,19 +72,21 @@ setLayout(new BorderLayout()); JPanel buttonPanel = new JPanel(); buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS)); - buttonPanel.add(getShowInstructionsButton()); - buttonPanel.add(getShowScreenshotButton()); - buttonPanel.add(getBeginChatButton()); -// buttonPanel.add(getDisplayInvestmentButton()); - buttonPanel.add(getStartRoundButton()); - buttonPanel.add(getShowQuizButton()); - buttonPanel.add(getStartRoundOverrideButton()); + addToBoxLayout(buttonPanel, getShowInstructionsButton()); + addToBoxLayout(buttonPanel, getShowInstructionsButton()); + addToBoxLayout(buttonPanel, getShowScreenshotButton()); + addToBoxLayout(buttonPanel, getBeginChatButton()); + // addToBoxLayout(buttonPanel, getDisplayInvestmentButton()); + addToBoxLayout(buttonPanel, getStartRoundButton()); + addToBoxLayout(buttonPanel, getShowQuizButton()); + addToBoxLayout(buttonPanel, getStartRoundOverrideButton()); + addToBoxLayout(buttonPanel, getStopRoundButton()); add(buttonPanel, BorderLayout.NORTH); informationEditorPane = UserInterfaceUtils.createInstructionsEditorPane(); informationScrollPane = new JScrollPane(informationEditorPane); informationScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); informationScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); - + JPanel messagePanel = new JPanel(new BorderLayout()); JLabel messagePanelLabel = new JLabel("System messages"); messagePanelLabel.setFont(UserInterfaceUtils.DEFAULT_PLAIN_FONT); @@ -98,7 +103,12 @@ splitPane.setDividerLocation(proportion); splitPane.setResizeWeight(proportion); } - + + private void addToBoxLayout(JPanel buttonPanel, JButton button) { + buttonPanel.add(button); + buttonPanel.add(Box.createHorizontalStrut(5)); + } + public void addMessage(String message) { try { messageEditorPane.getDocument().insertString(0, "-----\n" + message + "\n", null); @@ -107,13 +117,12 @@ } } - private JButton getShowInstructionsButton() { if (showInstructionsButton == null) { showInstructionsButton = new JButton("Show Instructions"); showInstructionsButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent event) { -// enableInstructionButton.setEnabled(false); + // enableInstructionButton.setEnabled(false); facilitator.transmit(new ShowInstructionsRequest(facilitator.getId())); } }); @@ -122,9 +131,9 @@ } /** - * This method initializes Start_Facilitator_Button - * - * @return javax.swing.JButton + * This method initializes Start_Facilitator_Button + * + * @return javax.swing.JButton */ private JButton getBeginChatButton() { @@ -132,7 +141,7 @@ beginChatButton = new JButton("Begin Chat"); beginChatButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent event) { - //At present default isChatEnabledBeforeRound() value isscreen false + // At present default isChatEnabledBeforeRound() value isscreen false if (facilitator.getCurrentRoundConfiguration().isChatEnabledBeforeRound()) { facilitator.transmit(new BeginChatRoundRequest(facilitator.getId())); } @@ -141,36 +150,36 @@ } return beginChatButton; } - + private JButton getStartRoundOverrideButton() { - if (overrideButton == null) { - overrideButton = new JButton("Override"); - overrideButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent event) { - facilitator.sendStartRoundOverride(); - } - }); - } - return overrideButton; + if (overrideButton == null) { + overrideButton = new JButton("Override"); + overrideButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent event) { + facilitator.sendStartRoundOverride(); + } + }); + } + return overrideButton; } - -// private JButton getDisplayInvestmentButton() { -// if (displayInvestmentButton == null) { -// displayInvestmentButton = new JButton("Show Investment Screen"); -// displayInvestmentButton.addActionListener(new ActionListener() { -// public void actionPerformed(ActionEvent event) { -// facilitator.transmit(new ShowTokenInvestmentScreenRequest(facilitator.getId())); -// } -// }); -// } -// return displayInvestmentButton; -// } + + // private JButton getDisplayInvestmentButton() { + // if (displayInvestmentButton == null) { + // displayInvestmentButton = new JButton("Show Investment Screen"); + // displayInvestmentButton.addActionListener(new ActionListener() { + // public void actionPerformed(ActionEvent event) { + // facilitator.transmit(new ShowTokenInvestmentScreenRequest(facilitator.getId())); + // } + // }); + // } + // return displayInvestmentButton; + // } public Facilitator getFacilitator() { return facilitator; } - private JButton getStartRoundButton() { + private JButton getStartRoundButton() { if (startRoundButton == null) { startRoundButton = new JButton("Start round"); startRoundButton.addActionListener(new ActionListener() { @@ -181,7 +190,19 @@ } return startRoundButton; } - + + private JButton getStopRoundButton() { + if (stopRoundButton == null) { + stopRoundButton = new JButton("Stop round"); + stopRoundButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + facilitator.sendEndRoundRequest(); + } + }); + } + return stopRoundButton; + } + private JButton getShowQuizButton() { if (showQuizButton == null) { showQuizButton = new JButton("Show quiz"); @@ -193,8 +214,8 @@ } return showQuizButton; } - - public void setText(final String text) { + + public void setInstructions(final String text) { SwingUtilities.invokeLater(new Runnable() { public void run() { informationEditorPane.setText(text); @@ -204,20 +225,16 @@ } /** - * FIXME: replace with StringTemplate - * - * @return + * + * @param event */ public void endRound(FacilitatorEndRoundEvent event) { - ServerDataModel model = event.getServerDataModel(); - builder = new StringBuilder(model.generateFacilitatorDebriefing()); - - setText(builder.toString()); + setInstructions(event.getServerDataModel().generateFacilitatorDebriefing()); } - + public void addInstructions(String instructions) { builder.append(instructions); - setText(builder.toString()); + setInstructions(builder.toString()); } private JButton getShowScreenshotButton() { diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -424,7 +424,7 @@ </entry><entry key="same-as-previous-round-instructions"><![CDATA[ - <h3>Round {self.roundNumber} Instructions</h3> + <h2>Round {self.roundNumber} Instructions</h2><hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> @@ -506,6 +506,7 @@ incorrectly are highlighted in red. Please see below for more details. {endif} </p> + <br><hr><p><span class='q1'>Question 1:</span><br> Given an existing infrastructure efficiency of 20%, if the five participants invest diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -424,7 +424,7 @@ </entry><entry key="same-as-previous-round-instructions"><![CDATA[ - <h3>Round {self.roundNumber} Instructions</h3> + <h2>Round {self.roundNumber} Instructions</h2><hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> @@ -506,6 +506,7 @@ incorrectly are highlighted in red. Please see below for more details. {endif} </p> + <br><hr><p><span class='q1'>Question 1:</span><br> Given an existing infrastructure efficiency of 20%, if the five participants invest diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -424,7 +424,7 @@ </entry><entry key="same-as-previous-round-instructions"><![CDATA[ - <h3>Round {self.roundNumber} Instructions</h3> + <h2>Round {self.roundNumber} Instructions</h2><hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> @@ -506,6 +506,7 @@ incorrectly are highlighted in red. Please see below for more details. {endif} </p> + <br><hr><p><span class='q1'>Question 1:</span><br> Given an existing infrastructure efficiency of 20%, if the five participants invest diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -424,7 +424,7 @@ </entry><entry key="same-as-previous-round-instructions"><![CDATA[ - <h3>Round {self.roundNumber} Instructions</h3> + <h2>Round {self.roundNumber} Instructions</h2><hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> @@ -506,6 +506,7 @@ incorrectly are highlighted in red. Please see below for more details. {endif} </p> + <br><hr><p><span class='q1'>Question 1:</span><br> Given an existing infrastructure efficiency of 20%, if the five participants invest diff -r 7a67c82159e2af3e2d42173649081dc0f36499fe -r c3913959c96218a3ab8ae3eccff6272372b4679d src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -424,7 +424,7 @@ </entry><entry key="same-as-previous-round-instructions"><![CDATA[ - <h3>Round {self.roundNumber} Instructions</h3> + <h2>Round {self.roundNumber} Instructions</h2><hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> @@ -506,6 +506,7 @@ incorrectly are highlighted in red. Please see below for more details. {endif} </p> + <br><hr><p><span class='q1'>Question 1:</span><br> Given an existing infrastructure efficiency of 20%, if the five participants invest Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-26 19:49:06
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/7a67c82159e2/ changeset: 7a67c82159e2 user: alllee date: 2012-03-26 21:49:03 summary: fixing configuration for same as previous round default instructions affected #: 11 files diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java @@ -107,7 +107,6 @@ ST template = createStringTemplate(getProperty("instructions", getParentConfiguration().getSameAsPreviousRoundInstructions())); // FIXME: probably should just lift these out into methods on RoundConfiguration // and refer to them as self.durationInMinutes or self.dollarsPerTokenCurrencyString, etc. - template.add("duration", inMinutes(getDuration()) + " minutes"); template.add("dollarsPerToken", toCurrencyString(getDollarsPerToken())); return template.render(); } diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -194,7 +194,7 @@ } public String getSameAsPreviousRoundInstructions() { - return render(getProperty("same-as-previous-round-instructions")); + return getProperty("same-as-previous-round-instructions"); } public String getClientDebriefingTemplate() { diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</p><p><b>Do you have any questions?</b> If you have any questions at this time please raise your hand and someone will come over to your station and answer it. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</p><p><b>Do you have any questions?</b> If you have any questions at this time please raise your hand and someone will come over to your station and answer it. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t1/round3.xml --- a/src/main/resources/configuration/asu/2011/t1/round3.xml +++ b/src/main/resources/configuration/asu/2011/t1/round3.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</p><p><b>Do you have any questions?</b> If you have any questions at this time please raise your hand and someone will come over to your station and answer it. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t2/round3.xml --- a/src/main/resources/configuration/asu/2011/t2/round3.xml +++ b/src/main/resources/configuration/asu/2011/t2/round3.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</p><p><b>Do you have any questions?</b> If you have any questions at this time please raise your hand and someone will come over to your station and answer it. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t3/round3.xml --- a/src/main/resources/configuration/asu/2011/t3/round3.xml +++ b/src/main/resources/configuration/asu/2011/t3/round3.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</p><p><b>Do you have any questions?</b> If you have any questions at this time please raise your hand and someone will come over to your station and answer it. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t4/round3.xml --- a/src/main/resources/configuration/asu/2011/t4/round3.xml +++ b/src/main/resources/configuration/asu/2011/t4/round3.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-26 19:29:38
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/7de75c20d61a/ changeset: 7de75c20d61a user: alllee date: 2012-03-26 21:29:37 summary: switching default chat duration back to 60, adding quiz.enabled before second practice round. affected #: 6 files diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java @@ -126,7 +126,7 @@ } public boolean isQuizEnabled() { - return getBooleanProperty("quiz"); + return getBooleanProperty("quiz.enabled"); } public String getQuizPage() { diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -186,7 +186,7 @@ } public int getChatDuration() { - return getIntProperty("chat-duration", 5); + return getIntProperty("chat-duration", 60); } public String getGameScreenshotInstructions() { diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/resources/configuration/asu/2011/t1/round1.xml --- a/src/main/resources/configuration/asu/2011/t1/round1.xml +++ b/src/main/resources/configuration/asu/2011/t1/round1.xml @@ -4,6 +4,7 @@ <comment>Irrigation experiment round configuration</comment><entry key="practice-round">true</entry><entry key='field-of-vision'>1</entry> +<entry key='quiz.enabled'>true</entry><entry key="instructions"><![CDATA[ diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/resources/configuration/asu/2011/t2/round1.xml --- a/src/main/resources/configuration/asu/2011/t2/round1.xml +++ b/src/main/resources/configuration/asu/2011/t2/round1.xml @@ -4,6 +4,7 @@ <comment>Irrigation experiment round configuration</comment><entry key="practice-round">true</entry><entry key='field-of-vision'>1</entry> +<entry key='quiz.enabled'>true</entry><entry key="instructions"><![CDATA[ diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/resources/configuration/asu/2011/t3/round1.xml --- a/src/main/resources/configuration/asu/2011/t3/round1.xml +++ b/src/main/resources/configuration/asu/2011/t3/round1.xml @@ -4,6 +4,7 @@ <comment>Irrigation experiment round configuration</comment><entry key="practice-round">true</entry><entry key='field-of-vision'>1</entry> +<entry key='quiz.enabled'>true</entry><entry key="instructions"><![CDATA[ diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/resources/configuration/asu/2011/t4/round1.xml --- a/src/main/resources/configuration/asu/2011/t4/round1.xml +++ b/src/main/resources/configuration/asu/2011/t4/round1.xml @@ -4,6 +4,7 @@ <comment>Irrigation experiment round configuration</comment><entry key="practice-round">true</entry><entry key='field-of-vision'>1</entry> +<entry key='quiz.enabled'>true</entry><entry key="instructions"><![CDATA[ Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-23 07:22:23
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/1efd068282e9/ changeset: 1efd068282e9 user: alllee date: 2012-03-23 08:22:19 summary: updated t3 and t4 limited vision, removing instructions to utilize sameAsPreviousRound templated instructions. affected #: 20 files diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round12.xml --- a/src/main/resources/configuration/asu/2011/t3/round12.xml +++ b/src/main/resources/configuration/asu/2011/t3/round12.xml @@ -5,6 +5,7 @@ <entry key='reset-infrastructure-efficiency'>true</entry><entry key='max-canal-flow-capacity'>27</entry> +<entry key='field-of-vision'>1</entry><entry key="instructions"><![CDATA[ diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round13.xml --- a/src/main/resources/configuration/asu/2011/t3/round13.xml +++ b/src/main/resources/configuration/asu/2011/t3/round13.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='max-canal-flow-capacity'>31</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 12 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round14.xml --- a/src/main/resources/configuration/asu/2011/t3/round14.xml +++ b/src/main/resources/configuration/asu/2011/t3/round14.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='max-canal-flow-capacity'>26</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 13 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round15.xml --- a/src/main/resources/configuration/asu/2011/t3/round15.xml +++ b/src/main/resources/configuration/asu/2011/t3/round15.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='max-canal-flow-capacity'>35</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 14 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round16.xml --- a/src/main/resources/configuration/asu/2011/t3/round16.xml +++ b/src/main/resources/configuration/asu/2011/t3/round16.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='max-canal-flow-capacity'>33</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 15 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round17.xml --- a/src/main/resources/configuration/asu/2011/t3/round17.xml +++ b/src/main/resources/configuration/asu/2011/t3/round17.xml @@ -3,15 +3,7 @@ <properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>28</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 16 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round18.xml --- a/src/main/resources/configuration/asu/2011/t3/round18.xml +++ b/src/main/resources/configuration/asu/2011/t3/round18.xml @@ -3,15 +3,6 @@ <properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>29</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 17 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round19.xml --- a/src/main/resources/configuration/asu/2011/t3/round19.xml +++ b/src/main/resources/configuration/asu/2011/t3/round19.xml @@ -2,16 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>25</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 18 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round20.xml --- a/src/main/resources/configuration/asu/2011/t3/round20.xml +++ b/src/main/resources/configuration/asu/2011/t3/round20.xml @@ -2,16 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>34</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 19 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t3/round21.xml --- a/src/main/resources/configuration/asu/2011/t3/round21.xml +++ b/src/main/resources/configuration/asu/2011/t3/round21.xml @@ -2,15 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>32</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 20 Instructions</h3> -<p> -This is the final round. -</p> -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round12.xml --- a/src/main/resources/configuration/asu/2011/t4/round12.xml +++ b/src/main/resources/configuration/asu/2011/t4/round12.xml @@ -2,6 +2,7 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='reset-infrastructure-efficiency'>true</entry><entry key='max-canal-flow-capacity'>27</entry> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round13.xml --- a/src/main/resources/configuration/asu/2011/t4/round13.xml +++ b/src/main/resources/configuration/asu/2011/t4/round13.xml @@ -2,16 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>31</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 12 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round14.xml --- a/src/main/resources/configuration/asu/2011/t4/round14.xml +++ b/src/main/resources/configuration/asu/2011/t4/round14.xml @@ -2,16 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>22</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 13 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round15.xml --- a/src/main/resources/configuration/asu/2011/t4/round15.xml +++ b/src/main/resources/configuration/asu/2011/t4/round15.xml @@ -2,16 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>36</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 14 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round16.xml --- a/src/main/resources/configuration/asu/2011/t4/round16.xml +++ b/src/main/resources/configuration/asu/2011/t4/round16.xml @@ -2,16 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>25</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 15 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round17.xml --- a/src/main/resources/configuration/asu/2011/t4/round17.xml +++ b/src/main/resources/configuration/asu/2011/t4/round17.xml @@ -2,16 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>32</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 16 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round18.xml --- a/src/main/resources/configuration/asu/2011/t4/round18.xml +++ b/src/main/resources/configuration/asu/2011/t4/round18.xml @@ -2,16 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>38</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 17 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round19.xml --- a/src/main/resources/configuration/asu/2011/t4/round19.xml +++ b/src/main/resources/configuration/asu/2011/t4/round19.xml @@ -2,16 +2,7 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>21</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 18 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round20.xml --- a/src/main/resources/configuration/asu/2011/t4/round20.xml +++ b/src/main/resources/configuration/asu/2011/t4/round20.xml @@ -2,16 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>29</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 19 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 -r 1efd068282e91649936e0a054962571ca9b45747 src/main/resources/configuration/asu/2011/t4/round21.xml --- a/src/main/resources/configuration/asu/2011/t4/round21.xml +++ b/src/main/resources/configuration/asu/2011/t4/round21.xml @@ -2,15 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='max-canal-flow-capacity'>39</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 20 Instructions</h3> -<p> -This is the final round. -</p> -]]> -</entry></properties> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-23 07:10:09
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/d151cae7fa64/ changeset: d151cae7fa64 user: alllee date: 2012-03-23 08:10:06 summary: updating t2 limited vision affected #: 11 files diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t1/round21.xml --- a/src/main/resources/configuration/asu/2011/t1/round21.xml +++ b/src/main/resources/configuration/asu/2011/t1/round21.xml @@ -6,12 +6,4 @@ <entry key='infrastructure-degradation-factor'>25</entry><entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 20 Instructions</h3> -<p> -This is the final round. -</p> -]]> -</entry></properties> diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round12.xml --- a/src/main/resources/configuration/asu/2011/t2/round12.xml +++ b/src/main/resources/configuration/asu/2011/t2/round12.xml @@ -3,7 +3,9 @@ <properties><comment>Irrigation experiment round configuration</comment> +<entry key='initial-infrastructure-efficiency'>75</entry><entry key='reset-infrastructure-efficiency'>true</entry> +<entry key='field-of-vision'>1</entry><entry key="instructions"><![CDATA[ diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round13.xml --- a/src/main/resources/configuration/asu/2011/t2/round13.xml +++ b/src/main/resources/configuration/asu/2011/t2/round13.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>10</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 12 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round14.xml --- a/src/main/resources/configuration/asu/2011/t2/round14.xml +++ b/src/main/resources/configuration/asu/2011/t2/round14.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>10</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 13 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round15.xml --- a/src/main/resources/configuration/asu/2011/t2/round15.xml +++ b/src/main/resources/configuration/asu/2011/t2/round15.xml @@ -4,14 +4,5 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>80</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 14 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round16.xml --- a/src/main/resources/configuration/asu/2011/t2/round16.xml +++ b/src/main/resources/configuration/asu/2011/t2/round16.xml @@ -3,15 +3,5 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>10</entry> - - -<entry key="instructions"> -<![CDATA[ -<h3>Round 15 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round17.xml --- a/src/main/resources/configuration/asu/2011/t2/round17.xml +++ b/src/main/resources/configuration/asu/2011/t2/round17.xml @@ -3,13 +3,5 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>5</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 16 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round18.xml --- a/src/main/resources/configuration/asu/2011/t2/round18.xml +++ b/src/main/resources/configuration/asu/2011/t2/round18.xml @@ -3,14 +3,6 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>10</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 17 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round19.xml --- a/src/main/resources/configuration/asu/2011/t2/round19.xml +++ b/src/main/resources/configuration/asu/2011/t2/round19.xml @@ -4,14 +4,5 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>80</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 18 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round20.xml --- a/src/main/resources/configuration/asu/2011/t2/round20.xml +++ b/src/main/resources/configuration/asu/2011/t2/round20.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>10</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 19 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 95c45592330fee26f53685af31c149eaba7423d4 -r d151cae7fa6451fcc9a0b7f0f83b6970919b1c90 src/main/resources/configuration/asu/2011/t2/round21.xml --- a/src/main/resources/configuration/asu/2011/t2/round21.xml +++ b/src/main/resources/configuration/asu/2011/t2/round21.xml @@ -4,13 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>10</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 20 Instructions</h3> -<p> -This is the final round. -</p> -]]> -</entry></properties> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-23 07:05:31
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/95c45592330f/ changeset: 95c45592330f user: alllee date: 2012-03-23 08:05:27 summary: setting limited vision flag on rounds 11-20 affected #: 10 files diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round12.xml --- a/src/main/resources/configuration/asu/2011/t1/round12.xml +++ b/src/main/resources/configuration/asu/2011/t1/round12.xml @@ -6,6 +6,7 @@ <entry key='initial-infrastructure-efficiency'>75</entry><entry key='reset-infrastructure-efficiency'>true</entry><entry key='infrastructure-degradation-factor'>20</entry> +<entry key='field-of-vision'>1</entry><entry key="instructions"><![CDATA[ diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round13.xml --- a/src/main/resources/configuration/asu/2011/t1/round13.xml +++ b/src/main/resources/configuration/asu/2011/t1/round13.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>30</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 12 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round14.xml --- a/src/main/resources/configuration/asu/2011/t1/round14.xml +++ b/src/main/resources/configuration/asu/2011/t1/round14.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>25</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 13 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round15.xml --- a/src/main/resources/configuration/asu/2011/t1/round15.xml +++ b/src/main/resources/configuration/asu/2011/t1/round15.xml @@ -3,14 +3,6 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>20</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 14 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round16.xml --- a/src/main/resources/configuration/asu/2011/t1/round16.xml +++ b/src/main/resources/configuration/asu/2011/t1/round16.xml @@ -3,15 +3,7 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>35</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 15 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round17.xml --- a/src/main/resources/configuration/asu/2011/t1/round17.xml +++ b/src/main/resources/configuration/asu/2011/t1/round17.xml @@ -3,13 +3,5 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>20</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 16 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round18.xml --- a/src/main/resources/configuration/asu/2011/t1/round18.xml +++ b/src/main/resources/configuration/asu/2011/t1/round18.xml @@ -3,14 +3,6 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>15</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 17 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round19.xml --- a/src/main/resources/configuration/asu/2011/t1/round19.xml +++ b/src/main/resources/configuration/asu/2011/t1/round19.xml @@ -3,15 +3,6 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>30</entry> +<entry key='field-of-vision'>1</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 18 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round20.xml --- a/src/main/resources/configuration/asu/2011/t1/round20.xml +++ b/src/main/resources/configuration/asu/2011/t1/round20.xml @@ -4,14 +4,6 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>30</entry> +<entry key='field-of-vision'>1</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 19 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d -r 95c45592330fee26f53685af31c149eaba7423d4 src/main/resources/configuration/asu/2011/t1/round21.xml --- a/src/main/resources/configuration/asu/2011/t1/round21.xml +++ b/src/main/resources/configuration/asu/2011/t1/round21.xml @@ -4,6 +4,7 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>25</entry> +<entry key='field-of-vision'>1</entry><entry key="instructions"><![CDATA[ Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-23 06:37:08
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/1b8e7a24dc44/ changeset: 1b8e7a24dc44 user: alllee date: 2012-03-23 07:37:06 summary: setting screenshot url to limited vision screenshot affected #: 6 files diff -r 3069b7dc9204db64a3da9348e257e4d3068c5651 -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -93,7 +93,7 @@ } public String getChatInstructions() { - return createStringTemplate(getProperty("chat-instructions")).render(); + return render(getProperty("chat-instructions")); } public String getChatDurationInMinutes() { @@ -190,11 +190,11 @@ } public String getGameScreenshotInstructions() { - return getProperty("game-screenshot-instructions"); + return render(getProperty("game-screenshot-instructions")); } public String getSameAsPreviousRoundInstructions() { - return createStringTemplate(getProperty("same-as-previous-round-instructions")).render(); + return render(getProperty("same-as-previous-round-instructions")); } public String getClientDebriefingTemplate() { diff -r 3069b7dc9204db64a3da9348e257e4d3068c5651 -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -119,7 +119,7 @@ <entry key='game-screenshot-instructions'><![CDATA[ -<img src="http://dev.commons.asu.edu/irrigation/images/screenshot.jpg"> +<img src="http://dev.commons.asu.edu/irrigation/images/limited-vision-screenshot.jpg"> ]]></entry> diff -r 3069b7dc9204db64a3da9348e257e4d3068c5651 -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -119,7 +119,7 @@ <entry key='game-screenshot-instructions'><![CDATA[ -<img src="http://dev.commons.asu.edu/irrigation/images/screenshot.jpg"> +<img src="http://dev.commons.asu.edu/irrigation/images/limited-vision-screenshot.jpg"> ]]></entry> diff -r 3069b7dc9204db64a3da9348e257e4d3068c5651 -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -119,7 +119,7 @@ <entry key='game-screenshot-instructions'><![CDATA[ -<img src="http://dev.commons.asu.edu/irrigation/images/screenshot.jpg"> +<img src="http://dev.commons.asu.edu/irrigation/images/limited-vision-screenshot.jpg"> ]]></entry> diff -r 3069b7dc9204db64a3da9348e257e4d3068c5651 -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -119,7 +119,7 @@ <entry key='game-screenshot-instructions'><![CDATA[ -<img src="http://dev.commons.asu.edu/irrigation/images/screenshot.jpg"> +<img src="http://dev.commons.asu.edu/irrigation/images/limited-vision-screenshot.jpg"> ]]></entry> diff -r 3069b7dc9204db64a3da9348e257e4d3068c5651 -r 1b8e7a24dc44daad9e5dced08e66a0693d2e343d src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -119,7 +119,7 @@ <entry key='game-screenshot-instructions'><![CDATA[ -<img src="http://dev.commons.asu.edu/irrigation/images/screenshot.jpg"> +<img src="http://dev.commons.asu.edu/irrigation/images/limited-vision-screenshot.jpg"> ]]></entry> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
|
From: Bitbucket <com...@bi...> - 2012-03-23 06:33:21
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/3069b7dc9204/ changeset: 3069b7dc9204 user: all...@SHESC-ALEE14-01.ph.cox.net date: 2012-03-23 07:31:04 summary: adding limited-vision interface screenshot affected #: 1 file diff -r 13f446cab25d3d9be42b046782528b8ccbcdb277 -r 3069b7dc9204db64a3da9348e257e4d3068c5651 src/main/resources/images/limited-vision-screenshot.jpg Binary file src/main/resources/images/limited-vision-screenshot.jpg has changed Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
![http://dev.commons.asu.edu/irrigation/images/screenshot.jpg">](http://dev.commons.asu.edu/irrigation/images/screenshot.jpg">){kind=link}
![http://dev.commons.asu.edu/irrigation/images/limited-vision-screenshot.jpg">](http://dev.commons.asu.edu/irrigation/images/limited-vision-screenshot.jpg">){kind=link}