Changeset 10230 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/ConsecutiveSamplesEvaluator.cs

Timestamp:

12/16/13 16:11:31 (10 years ago)

Author:

mkommend

Message:

#1997: Updated symbolic island algorithm evaluators and added automatic wiring of evaluators.

File:

• branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/ConsecutiveSamplesEvaluator.cs (modified) (3 diffs)

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/ConsecutiveSamplesEvaluator.cs

@@ -47 +47 @@
     private const string MaximumIterationsParameterName = "Maximum Iterations";
 
-
     #region parameter properties
     public ILookupParameter<IDataAnalysisProblemData> ProblemDataParameter {
@@ -59 +58 @@
     }
     public ILookupParameter<IntRange> FitnessCalculationPartitionParameter {
-      get { return (IValueLookupParameter<IntRange>)Parameters[FitnessCalculationPartitionParameterName]; }
+      get { return (ILookupParameter<IntRange>)Parameters[FitnessCalculationPartitionParameterName]; }
     }
     public ILookupParameter<IntRange> FixedSamplesPartitionParameter {
@@ -128 +127 @@
       var fixedSamples = FixedSamplesPartitionParameter.ActualValue;
 
-      //create fixed rows enumerable
-      var rows = Enumerable.Range(fixedSamples.Start, fixedSamples.Size);
-      //create consecutive rows enumerable
-      if (ConsecutiveSamples > 0) {
-        var dataMigrationInterval = DataMigrationIntervalParameter.ActualValue.Value;
-        var islandIndex = IslandIndexParameter.ActualValue.Value;
-        var generation = IterationsParameter.ActualValue.Value;
-        var iteration = islandIndex + (generation / dataMigrationInterval);
-        var consecutiveRows = GenerateRows(samples, fixedSamples, ConsecutiveSamples, Overlap, iteration);
-        rows = rows.Concat(consecutiveRows);
+      var dataMigrationInterval = DataMigrationIntervalParameter.ActualValue.Value;
+      var generationValue = IterationsParameter.ActualValue;
+      var generation = generationValue == null ? 0 : generationValue.Value;
+
+      //calculat new rows for evaluation
+      if (generation % dataMigrationInterval == 0) {
+        //create fixed rows enumerable
+        var rows = Enumerable.Range(fixedSamples.Start, fixedSamples.Size);
+        //create consecutive rows enumerable
+        if (ConsecutiveSamples > 0) {
+          var islandIndex = IslandIndexParameter.ActualValue.Value;
+          var iteration = islandIndex + (generation / dataMigrationInterval);
+          var consecutiveRows = GenerateRows(samples, fixedSamples, ConsecutiveSamples, Overlap, iteration);
+          rows = rows.Concat(consecutiveRows);
+        }
+        //filter out test rows
+        rows = rows.Where(r => r < problemData.TestPartition.Start || r > problemData.TestPartition.End);
+
+        //TODO change to lookup parameter
+        ExecutionContext.Scope.Variables.Remove("Rows");
+        ExecutionContext.Scope.Variables.Add(new HeuristicLab.Core.Variable("Rows", new EnumerableItem<int>(rows)));
       }
-      //filter out test rows
-      rows = rows.Where(r => r < problemData.TestPartition.Start || r > problemData.TestPartition.End);
 
-      //execution context is created manually to be able to clear the rows parameter easily
       var executionContext = new ExecutionContext(ExecutionContext, evaluator, ExecutionContext.Scope);
-
-      //TODO change to lookup parameter
-      executionContext.Scope.Variables.Remove("Rows");
-      executionContext.Scope.Variables.Add(new HeuristicLab.Core.Variable("Rows", new EnumerableItem<int>(rows)));
       var successor = evaluator.Execute(executionContext, this.CancellationToken);
       return new OperationCollection(successor, base.Apply());