Changeset 10421 for branches

Timestamp:

01/29/14 14:23:45 (11 years ago)

Author:

mkommend

Message:

#1997: Corrected rounding mistake in island evaluators.

Location:

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

Files:

• ConsecutiveSamplesEvaluator.cs (modified) (1 diff)
• RandomSamplesEvaluator .cs (modified) (1 diff)

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

@@ -139 +139 @@
           var islandIndex = IslandIndexParameter.ActualValue.Value;
           var iteration = islandIndex + (generation / dataMigrationInterval);
-          var consecutiveSamples = (int)ConsecutiveSamples * samples.Size;
+          var consecutiveSamples = (int)(ConsecutiveSamples * samples.Size);
           var overlap = (int)Overlap * consecutiveSamples;
           var consecutiveRows = GenerateRows(samples, fixedSamples, consecutiveSamples, overlap, iteration);

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

@@ -116 +116 @@
       var samples = FitnessCalculationPartitionParameter.ActualValue;
       var fixedSamples = FixedSamplesPartitionParameter.ActualValue;
-      var randomSamples = (int)RandomSamples * samples.Size;
+      var randomSamples = (int)(RandomSamples * samples.Size);
 
       var dataMigrationInterval = DataMigrationIntervalParameter.ActualValue.Value;