[virtualcommons-svn] commit/foraging: alllee: adding missing headers back to AggregateTimeIntervalP
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] commit/foraging: alllee: adding missing headers back to AggregateTimeIntervalProcessor and changing save file
|
From: Bitbucket <com...@bi...> - 2012-02-06 22:46:00
|
1 new commit in foraging: https://bitbucket.org/virtualcommons/foraging/changeset/312ce9ac8bef/ changeset: 312ce9ac8bef user: alllee date: 2012-02-06 23:45:55 summary: adding missing headers back to AggregateTimeIntervalProcessor and changing save file processing to use predictable group iteration order affected #: 6 files diff -r c4bfc740cfdc5eaa6878b92678868554c3a0ba61 -r 312ce9ac8bef8d4d3dbc4d4d2d7305cf268e8e22 src/main/java/edu/asu/commons/foraging/client/ForagingClient.java --- a/src/main/java/edu/asu/commons/foraging/client/ForagingClient.java +++ b/src/main/java/edu/asu/commons/foraging/client/ForagingClient.java @@ -49,6 +49,7 @@ import edu.asu.commons.foraging.ui.GameWindow2D; import edu.asu.commons.foraging.ui.GameWindow3D; import edu.asu.commons.net.SocketIdentifier; +import edu.asu.commons.ui.UserInterfaceUtils; import edu.asu.commons.util.Duration; import edu.asu.commons.util.Utils; @@ -424,10 +425,7 @@ client.connect(); frame.setTitle("Client Window: " + client.getId()); frame.add(client.clientPanel); - frame.pack(); - frame.setExtendedState(Frame.MAXIMIZED_BOTH); - frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - frame.setVisible(true); + UserInterfaceUtils.maximize(frame); } }; SwingUtilities.invokeLater(createGuiRunnable); diff -r c4bfc740cfdc5eaa6878b92678868554c3a0ba61 -r 312ce9ac8bef8d4d3dbc4d4d2d7305cf268e8e22 src/main/java/edu/asu/commons/foraging/data/AggregateTimeIntervalProcessor.java --- a/src/main/java/edu/asu/commons/foraging/data/AggregateTimeIntervalProcessor.java +++ b/src/main/java/edu/asu/commons/foraging/data/AggregateTimeIntervalProcessor.java @@ -6,7 +6,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.TreeSet; import edu.asu.commons.event.PersistableEvent; @@ -29,7 +28,7 @@ import edu.asu.commons.util.Utils; /** - * $Id: AggregateTimeIntervalProcessor.java 526 2010-08-06 01:25:27Z alllee $ + * $Id$ * * Generates aggregate statistics * @@ -50,7 +49,7 @@ } RoundConfiguration roundConfiguration = (RoundConfiguration) savedRoundData.getRoundParameters(); TreeSet<Identifier> orderedIdentifiers = new TreeSet<Identifier>(serverDataModel.getClientDataMap().keySet()); - List<GroupDataModel> groups = new ArrayList<GroupDataModel>(serverDataModel.getGroups()); + List<GroupDataModel> groups = serverDataModel.getOrderedGroups(); List<String> movementHeader = new ArrayList<String>(); List<String> collectedTokensHeader = new ArrayList<String>(); @@ -60,17 +59,17 @@ } // headers for average probability of a token for each group - // List<String> tokenProbabilityGroupNumberHeader = new ArrayList<String>(); + List<String> tokenProbabilityGroupNumberHeader = new ArrayList<String>(); // headers for tokens left in each group - // List<String> tokensLeftGroupNumberHeader = new ArrayList<String>(); + List<String> tokensLeftGroupNumberHeader = new ArrayList<String>(); List<String> distanceHeader = new ArrayList<String>(); - for (int groupIndex = 0; groupIndex < groups.size(); groupIndex++) { - String groupNumber = "Group-" + groupIndex; - // tokenProbabilityGroupNumberHeader.add(groupNumber + " avg token P"); - // tokensLeftGroupNumberHeader.add(groupNumber + " tokens left"); + for (GroupDataModel group: groups) { + String groupNumber = group.toString(); + tokenProbabilityGroupNumberHeader.add(groupNumber + " avg token P"); + tokensLeftGroupNumberHeader.add(groupNumber + " tokens left"); - List<Identifier> ids = new ArrayList<Identifier>(groups.get(groupIndex).getOrderedClientIdentifiers()); + List<Identifier> ids = new ArrayList<Identifier>(group.getOrderedClientIdentifiers()); for (int i = 0; i < ids.size(); i++) { Identifier id = ids.get(i); for (int j = i+1; j < ids.size(); j++) { @@ -87,9 +86,9 @@ // tokens Utils.join(',', collectedTokensHeader), // group token probabilities - // Utils.join(',', tokenProbabilityGroupNumberHeader), + Utils.join(',', tokenProbabilityGroupNumberHeader), // group total tokens left - // Utils.join(',', tokensLeftGroupNumberHeader), + Utils.join(',', tokensLeftGroupNumberHeader), // distance between participants Utils.join(',', distanceHeader) ); @@ -190,15 +189,15 @@ return distances; } - private List<Double> getExpectedTokenProbabilities(ServerDataModel state) { + private List<Double> getExpectedTokenProbabilities(ServerDataModel serverDataModel) { List<Double> expectedTokens = new ArrayList<Double>(); - Set<GroupDataModel> groups = state.getGroups(); - ResourceDispenser dispenser = new ResourceDispenser(state); + List<GroupDataModel> groups = serverDataModel.getOrderedGroups(); + ResourceDispenser dispenser = new ResourceDispenser(serverDataModel); StochasticGenerator generator = dispenser.getDensityDependentGenerator(); for (GroupDataModel group: groups) { double tokenProbabilitySum = 0; - for (int x = 0; x < state.getBoardWidth(); x++) { - for (int y = 0; y < state.getBoardHeight(); y++) { + for (int x = 0; x < serverDataModel.getBoardWidth(); x++) { + for (int y = 0; y < serverDataModel.getBoardHeight(); y++) { if (! group.getResourcePositions().contains(new Point(x, y))) { tokenProbabilitySum += generator.getProbabilityForCell(group, x, y); } diff -r c4bfc740cfdc5eaa6878b92678868554c3a0ba61 -r 312ce9ac8bef8d4d3dbc4d4d2d7305cf268e8e22 src/main/java/edu/asu/commons/foraging/data/AggregateTokenSpatialDistributionProcessor.java --- a/src/main/java/edu/asu/commons/foraging/data/AggregateTokenSpatialDistributionProcessor.java +++ b/src/main/java/edu/asu/commons/foraging/data/AggregateTokenSpatialDistributionProcessor.java @@ -3,8 +3,8 @@ import java.awt.Dimension; import java.awt.Point; import java.io.PrintWriter; -import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.SortedSet; @@ -62,9 +62,8 @@ ServerDataModel serverDataModel, Map<Identifier, ClientSpatialDistribution> clientSpatialDistributionMap) { - ArrayList<GroupDataModel> groups = new ArrayList<GroupDataModel>(serverDataModel.getGroups()); + List<GroupDataModel> groups = serverDataModel.getOrderedGroups(); for (GroupDataModel group: groups) { -// String groupLabel = "Group # " + groups.indexOf(group); String groupLabel = group.toString(); writer.println("Time, Identifier, Group, # tokens, row stdev, column stdev"); double groupWeightedSpatialMetric = 0.0d; diff -r c4bfc740cfdc5eaa6878b92678868554c3a0ba61 -r 312ce9ac8bef8d4d3dbc4d4d2d7305cf268e8e22 src/main/java/edu/asu/commons/foraging/data/CollectedTokenSpatialDistributionProcessor.java --- a/src/main/java/edu/asu/commons/foraging/data/CollectedTokenSpatialDistributionProcessor.java +++ b/src/main/java/edu/asu/commons/foraging/data/CollectedTokenSpatialDistributionProcessor.java @@ -3,8 +3,8 @@ import java.awt.Dimension; import java.awt.Point; import java.io.PrintWriter; -import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.SortedSet; @@ -55,9 +55,8 @@ PrintWriter writer, ServerDataModel serverDataModel, Map<Identifier, ClientSpatialDistribution> clientSpatialDistributionMap) { - ArrayList<GroupDataModel> groups = new ArrayList<GroupDataModel>(serverDataModel.getGroups()); + List<GroupDataModel> groups = serverDataModel.getOrderedGroups(); for (GroupDataModel group: groups) { -// String groupLabel = "Group #" + groups.indexOf(group); String groupLabel = group.toString(); writer.println("Identifier, Group, # tokens, row stdev, column stdev"); double groupWeightedSpatialMetric = 0.0d; diff -r c4bfc740cfdc5eaa6878b92678868554c3a0ba61 -r 312ce9ac8bef8d4d3dbc4d4d2d7305cf268e8e22 src/main/java/edu/asu/commons/foraging/data/SummaryProcessor.java --- a/src/main/java/edu/asu/commons/foraging/data/SummaryProcessor.java +++ b/src/main/java/edu/asu/commons/foraging/data/SummaryProcessor.java @@ -29,7 +29,7 @@ @Override public void process(SavedRoundData savedRoundData, PrintWriter writer) { ServerDataModel serverDataModel = (ServerDataModel) savedRoundData.getDataModel(); - List<GroupDataModel> groups = new ArrayList<GroupDataModel>(serverDataModel.getGroups()); + List<GroupDataModel> groups = serverDataModel.getOrderedGroups(); for (GroupDataModel group: groups) { int totalConsumedGroupTokens = 0; ArrayList<String> clientTokens = new ArrayList<String>(); diff -r c4bfc740cfdc5eaa6878b92678868554c3a0ba61 -r 312ce9ac8bef8d4d3dbc4d4d2d7305cf268e8e22 src/main/java/edu/asu/commons/foraging/server/ForagingServer.java --- a/src/main/java/edu/asu/commons/foraging/server/ForagingServer.java +++ b/src/main/java/edu/asu/commons/foraging/server/ForagingServer.java @@ -258,6 +258,7 @@ // reassociation of clients to ids and data. should be // logged however so we can remember the context of the data transmit(new ClientMessageEvent(event.getId(), "The experiment has already started, we cannot add you at this time.")); + sendFacilitatorMessage(String.format("Experiment was already started, not adding %s", event.getId())); return; } Identifier identifier = event.getId(); Repository URL: https://bitbucket.org/virtualcommons/foraging/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
