more WIP incrementally computing metrics

Evaluation/src/metrics/Metric.java

@@ -113,6 +113,12 @@ public MultiMetricValue multiMetricValue()
 	 */
 	public abstract void startNewTrial(final Context context, final Trial fullTrial);
 
+	/**
+	 * Observe the next state for incrementally computing metrics.
+	 * @param context
+	 */
+	public abstract void observeNextState(final Context context);
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/MetricsTracker.java

@@ -52,7 +52,10 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 	 */
 	public void observeNextState(final Context context)
 	{
-		// TODO
+		for (final Metric metric : metrics)
+		{
+			metric.observeNextState(context);
+		}
 	}
 
 	/**

Evaluation/src/metrics/designer/IdealDuration.java

@@ -95,6 +95,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		System.err.println("Incrementally computing metric not yet implemented for IdealDuration.");
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		System.err.println("Incrementally computing metric not yet implemented for IdealDuration.");
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/designer/SkillTrace.java

@@ -256,6 +256,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		System.err.println("Incrementally computing metric not yet implemented for SkillTrace.");
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		System.err.println("Incrementally computing metric not yet implemented for SkillTrace.");
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/multiple/metrics/BoardSitesOccupied.java

@@ -68,6 +68,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		currValueList.add(Double.valueOf(Double.valueOf(Utils.boardDefaultSitesCovered(context).size()).doubleValue() / numberDefaultBoardSites));
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		currValueList.add(Double.valueOf(Double.valueOf(Utils.boardDefaultSitesCovered(context).size()).doubleValue() / numberDefaultBoardSites));
+	}
+
 	//-------------------------------------------------------------------------
 
 

Evaluation/src/metrics/multiple/metrics/BranchingFactor.java

@@ -56,6 +56,14 @@ public Double[] getMetricValueList(final Evaluation evaluation, final Trial tria
 	public void startNewTrial(final Context context, final Trial fullTrial)
 	{
 		currValueList = new ArrayList<Double>();
+		currValueList.add(Double.valueOf(context.game().moves(context).moves().size()));
+	}
+
+	@Override
+	public void observeNextState(final Context context)
+	{
+		if (!context.trial().over())
+			currValueList.add(Double.valueOf(context.game().moves(context).moves().size()));
 	}
 
 	//-------------------------------------------------------------------------

Evaluation/src/metrics/multiple/metrics/DecisionFactor.java

@@ -58,6 +58,16 @@ public Double[] getMetricValueList(final Evaluation evaluation, final Trial tria
 	public void startNewTrial(final Context context, final Trial fullTrial)
 	{
 		currValueList = new ArrayList<Double>();
+
+		if (context.game().moves(context).moves().size() > 1)
+			currValueList.add(Double.valueOf(context.game().moves(context).moves().size()));
+	}
+
+	@Override
+	public void observeNextState(final Context context)
+	{
+		if (!context.trial().over() && context.game().moves(context).moves().size() > 1)
+			currValueList.add(Double.valueOf(context.game().moves(context).moves().size()));
 	}
 
 	//-------------------------------------------------------------------------

Evaluation/src/metrics/multiple/metrics/Drama.java

@@ -83,6 +83,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		System.err.println("Incrementally computing metric not yet implemented for Drama.");
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		System.err.println("Incrementally computing metric not yet implemented for Drama.");
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/multiple/metrics/MoveDistance.java

@@ -101,6 +101,28 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		currValueList = new ArrayList<Double>();
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		final Move m = context.trial().lastMove();
+
+		final SiteType moveType = m.fromType();
+
+		if 
+		(
+			m.fromType() == m.toType() 
+			&&
+			m.from() < boardTopology.numSites(moveType)
+			&&
+			m.to() < boardTopology.numSites(moveType)
+			&&
+			m.from() != m.to()
+		)	
+		{
+			currValueList.add(Double.valueOf(boardTopology.distancesToOtherSite(moveType)[m.from()][m.to()]));
+		}
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/multiple/metrics/MoveEvaluation.java

@@ -58,6 +58,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		System.err.println("Incrementally computing metric not yet implemented for MoveEvaluation.");
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		System.err.println("Incrementally computing metric not yet implemented for MoveEvaluation.");
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/multiple/metrics/PieceNumber.java

@@ -61,6 +61,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		currValueList.add(Double.valueOf(Utils.numPieces(context)));
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		currValueList.add(Double.valueOf(Utils.numPieces(context)));
+	}
+
 	//-------------------------------------------------------------------------
 
 

Evaluation/src/metrics/multiple/metrics/ScoreDifference.java

@@ -88,6 +88,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		currValueList.add(Double.valueOf(getScoreDiscrepancy(context)));
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		currValueList.add(Double.valueOf(getScoreDiscrepancy(context)));
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/multiple/metrics/StateEvaluationDifference.java

@@ -81,6 +81,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		System.err.println("Incrementally computing metric not yet implemented for StateEvaluationDifference.");
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		System.err.println("Incrementally computing metric not yet implemented for StateEvaluationDifference.");
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/boardCoverage/BoardCoverageDefault.java

@@ -94,6 +94,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		sitesCovered.addAll(Utils.boardDefaultSitesCovered(context));
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		sitesCovered.addAll(Utils.boardDefaultSitesCovered(context));
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/boardCoverage/BoardCoverageFull.java

@@ -91,6 +91,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		sitesCovered.addAll(Utils.boardAllSitesCovered(context));
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		sitesCovered.addAll(Utils.boardAllSitesCovered(context));
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/boardCoverage/BoardCoverageUsed.java

@@ -91,6 +91,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		sitesCovered.addAll(Utils.boardUsedSitesCovered(context));
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		sitesCovered.addAll(Utils.boardUsedSitesCovered(context));
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/complexity/DecisionMoves.java

@@ -94,6 +94,13 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 			numDecisionMoves += 1.0;
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		if (!context.trial().over() && context.game().moves(context).moves().size() > 1)
+			numDecisionMoves += 1.0;
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/complexity/GameTreeComplexity.java

@@ -91,6 +91,13 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		branchingFactor += ((double) context.game().moves(context).moves().size()) / numFullTrialMoves;
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		if (!context.trial().over())
+			branchingFactor += ((double) context.game().moves(context).moves().size()) / numFullTrialMoves;
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/complexity/StateSpaceComplexity.java

@@ -75,6 +75,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		// Do nothing
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		// Do nothing
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/duration/DurationActions.java

@@ -18,6 +18,11 @@
  */
 public class DurationActions extends Metric
 {
+
+	//-------------------------------------------------------------------------
+
+	/** For incremental computation */
+	protected double actionTally = 0.0;
 
 	//-------------------------------------------------------------------------
 
@@ -64,6 +69,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		// Do nothing
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		actionTally += context.trial().lastMove().actions().size();
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/duration/DurationMoves.java

@@ -62,6 +62,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		// Do nothing
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		// Do nothing
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/duration/DurationTurns.java

@@ -62,6 +62,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		// Do nothing
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		// Do nothing
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/duration/DurationTurnsNotTimeouts.java

@@ -81,6 +81,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		// Do nothing
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		// Do nothing
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/duration/DurationTurnsStdDev.java

@@ -84,6 +84,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		// Do nothing
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		// Do nothing
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/outcome/AdvantageP1.java

@@ -71,6 +71,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		// Do nothing
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		// Do nothing
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/outcome/Balance.java

@@ -91,6 +91,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		// Do nothing
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		// Do nothing
+	}
+
 	//-------------------------------------------------------------------------
 
 }

Evaluation/src/metrics/single/outcome/Completion.java

@@ -66,6 +66,12 @@ public void startNewTrial(final Context context, final Trial fullTrial)
 		// Do nothing
 	}
 
+	@Override
+	public void observeNextState(final Context context)
+	{
+		// Do nothing
+	}
+
 	//-------------------------------------------------------------------------
 
 }