Changeset 5759 for branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4

Timestamp:

03/19/11 02:22:45 (14 years ago)

Author:

mkommend

Message:

#1418:

• Worked on IntRange and DoubleRange
• Updated evaluators, analyzers, problems and problem data to use IntRanges
• Removed properties to access the value of LookupParameter
• Corrected files.txt

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• CrossValidation.cs (modified) (2 diffs)
• Linear/LinearDiscriminantAnalysis.cs (modified) (1 diff)
• Linear/LinearRegression.cs (modified) (1 diff)
• SupportVectorMachine/SupportVectorClassification.cs (modified) (3 diffs)
• SupportVectorMachine/SupportVectorRegression.cs (modified) (1 diff)
• kMeans/KMeansClustering.cs (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -271 +271 @@
             clonedAlgorithm.Name = algorithm.Name + " Fold " + i;
             IDataAnalysisProblem problem = clonedAlgorithm.Problem as IDataAnalysisProblem;
-            problem.ProblemData.TestPartitionEnd.Value = (i + 1) == Folds.Value ? SamplesEnd.Value : (i + 1) * testSamplesCount + SamplesStart.Value;
-            problem.ProblemData.TestPartitionStart.Value = (i * testSamplesCount) + SamplesStart.Value;
+            problem.ProblemData.TestPartition.End = (i + 1) == Folds.Value ? SamplesEnd.Value : (i + 1) * testSamplesCount + SamplesStart.Value;
+            problem.ProblemData.TestPartition.Start = (i * testSamplesCount) + SamplesStart.Value;
             clonedAlgorithms.Add(clonedAlgorithm);
           }
@@ -408 +408 @@
     }
     private void SamplesStart_ValueChanged(object sender, EventArgs e) {
-      if (Problem != null) Problem.ProblemData.TrainingPartitionStart.Value = SamplesStart.Value;
+      if (Problem != null) Problem.ProblemData.TrainingPartition.Start = SamplesStart.Value;
     }
     private void SamplesEnd_ValueChanged(object sender, EventArgs e) {
-      if (Problem != null) Problem.ProblemData.TrainingPartitionEnd.Value = SamplesEnd.Value;
+      if (Problem != null) Problem.ProblemData.TrainingPartition.End = SamplesEnd.Value;
     }
 

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearDiscriminantAnalysis.cs

@@ -71 +71 @@
       string targetVariable = problemData.TargetVariable;
       IEnumerable<string> allowedInputVariables = problemData.AllowedInputVariables;
-      int samplesStart = problemData.TrainingPartitionStart.Value;
-      int samplesEnd = problemData.TrainingPartitionEnd.Value;
+      int samplesStart = problemData.TrainingPartition.Start;
+      int samplesEnd = problemData.TrainingPartition.End;
       IEnumerable<int> rows = Enumerable.Range(samplesStart, samplesEnd - samplesStart);
       int nClasses = problemData.ClassNames.Count();

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

@@ -73 +73 @@
       string targetVariable = problemData.TargetVariable;
       IEnumerable<string> allowedInputVariables = problemData.AllowedInputVariables;
-      int samplesStart = problemData.TrainingPartitionStart.Value;
-      int samplesEnd = problemData.TrainingPartitionEnd.Value;
+      int samplesStart = problemData.TrainingPartition.Start;
+      int samplesEnd = problemData.TrainingPartition.End;
       IEnumerable<int> rows = Enumerable.Range(samplesStart, samplesEnd - samplesStart);
       double[,] inputMatrix = AlglibUtil.PrepareInputMatrix(dataset, allowedInputVariables.Concat(new string[] { targetVariable }), rows);

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassification.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -29 +30 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using System.Collections.Generic;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
@@ -124 +122 @@
       Dataset dataset = problemData.Dataset;
       string targetVariable = problemData.TargetVariable;
-      int start = problemData.TrainingPartitionStart.Value;
-      int end = problemData.TrainingPartitionEnd.Value;
+      int start = problemData.TrainingPartition.Start;
+      int end = problemData.TrainingPartition.End;
       IEnumerable<int> rows = Enumerable.Range(start, end - start);
 

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.cs

@@ -132 +132 @@
       Dataset dataset = problemData.Dataset;
       string targetVariable = problemData.TargetVariable;
-      int start = problemData.TrainingPartitionStart.Value;
-      int end = problemData.TrainingPartitionEnd.Value;
+      int start = problemData.TrainingPartition.Start;
+      int end = problemData.TrainingPartition.End;
       IEnumerable<int> rows = Enumerable.Range(start, end - start);
 

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClustering.cs

@@ -88 +88 @@
       Dataset dataset = problemData.Dataset;
       IEnumerable<string> allowedInputVariables = problemData.AllowedInputVariables;
-      int start = problemData.TrainingPartitionStart.Value;
-      int end = problemData.TrainingPartitionEnd.Value;
+      int start = problemData.TrainingPartition.Start;
+      int end = problemData.TrainingPartition.End;
       IEnumerable<int> rows = Enumerable.Range(start, end - start);
       int info;