Changeset 6232

Timestamp:

05/18/11 11:08:26 (14 years ago)

Author:

epitzer

Message:

rebased on current trunk r6223 (#1530)

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Encodings.PermutationEncoding (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• HeuristicLab.Persistence (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting.Views (modified) (1 prop)
• HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) (1 diff)
• HeuristicLab/3.3/Tests/CollectObjectGraphTest.cs (modified) (1 diff)
• HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj (modified) (1 diff)

branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

@@ -37 +37 @@
     private const string ClassNamesParameterName = "ClassNames";
     private const string ClassificationPenaltiesParameterName = "ClassificationPenalties";
-    private const int MaximumNumberOfClass = 100;
+    private const int MaximumNumberOfClasses = 20;
     private const int InspectedRowsToDetermineTargets = 500;
 
@@ -266 +266 @@
 
     private static IEnumerable<string> CheckVariablesForPossibleTargetVariables(Dataset dataset) {
+      int maxSamples = Math.Min(InspectedRowsToDetermineTargets, dataset.Rows);
       var validTargetVariables = from v in dataset.VariableNames
-                                 let DistinctValues = dataset.Rows > InspectedRowsToDetermineTargets ? dataset.GetVariableValues(v, 0, InspectedRowsToDetermineTargets).Distinct().Count()
-                                                                        : dataset.GetVariableValues(v).Distinct().Count()
-                                 where DistinctValues < MaximumNumberOfClass
+                                 let DistinctValues = dataset.GetVariableValues(v)
+                                   .Take(maxSamples)
+                                   .Distinct()
+                                   .Count()
+                                 where DistinctValues < MaximumNumberOfClasses
                                  select v;
 
       if (!validTargetVariables.Any())
-        throw new ArgumentException("Import of classification problem data was not successfull, because no target variable was found." +
-          " A target variable must have at most " + MaximumNumberOfClass + " distinct values to be applicable to classification.");
+        throw new ArgumentException("Import of classification problem data was not successful, because no target variable was found." +
+          " A target variable must have at most " + MaximumNumberOfClasses + " distinct values to be applicable to classification.");
       return validTargetVariables;
     }

branches/PersistenceSpeedUp/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -129 +129 @@
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="CustomPostBuild.cmd" />
     <None Include="CopyAssemblies.cmd" />

branches/PersistenceSpeedUp/HeuristicLab/3.3/Tests/CollectObjectGraphTest.cs

@@ -88 +88 @@
     }
 
+    /// <summary>
+    /// Tests if performance of multiple executions of a GA stays constant (as discussed in #1424)
+    /// Tests if object collection works after multiple executions of a GA 
+    /// (for example the traversal of `ThreadLocal` objects in CollectObjectGraphObjects 
+    /// causes a StackOverflow occurs after some executions)
+    /// </summary>
     [TestMethod]
     public void AlgorithmExecutions() {

branches/PersistenceSpeedUp/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj

@@ -560 +560 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="GA_SymbReg2.hl">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />