Changeset 5759 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis

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.Problems.DataAnalysis/3.4

Files:

• Implementation/DataAnalysisProblemData.cs (modified) (5 diffs)
• Interfaces/IDataAnalysisProblemData.cs (modified) (1 diff)
• OnlineEvaluators/OnlineLinearScalingParameterCalculator.cs (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

@@ -35 +35 @@
     private const string DatasetParameterName = "Dataset";
     private const string InputVariablesParameterName = "InputVariables";
-    private const string TrainingPartitionStartParameterName = "TrainingPartitionStart";
-    private const string TrainingPartitionEndParameterName = "TrainingPartitionEnd";
-    private const string TestPartitionStartParameterName = "TestPartitionStart";
-    private const string TestPartitionEndParameterName = "TestPartitionEnd";
+    private const string TrainingPartitionParameterName = "TrainingPartition";
+    private const string TestPartitionParameterName = "TestPartition";
 
     #region parameter properites
@@ -47 +45 @@
       get { return (IFixedValueParameter<ICheckedItemList<StringValue>>)Parameters[InputVariablesParameterName]; }
     }
-    public IFixedValueParameter<IntValue> TrainingPartitionStartParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[TrainingPartitionStartParameterName]; }
+    public IFixedValueParameter<IntRange> TrainingPartitionParameter {
+      get { return (IFixedValueParameter<IntRange>)Parameters[TrainingPartitionParameterName]; }
     }
-    public IFixedValueParameter<IntValue> TrainingPartitionEndParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[TrainingPartitionEndParameterName]; }
-    }
-    public IFixedValueParameter<IntValue> TestPartitionStartParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[TestPartitionStartParameterName]; }
-    }
-    public IFixedValueParameter<IntValue> TestPartitionEndParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[TestPartitionEndParameterName]; }
+    public IFixedValueParameter<IntRange> TestPartitionParameter {
+      get { return (IFixedValueParameter<IntRange>)Parameters[TestPartitionParameterName]; }
     }
     #endregion
@@ -72 +64 @@
     }
 
-    public IntValue TrainingPartitionStart {
-      get { return TrainingPartitionStartParameter.Value; }
+    public IntRange TrainingPartition {
+      get { return TrainingPartitionParameter.Value; }
     }
-    public IntValue TrainingPartitionEnd {
-      get { return TrainingPartitionEndParameter.Value; }
-    }
-    public IntValue TestPartitionStart {
-      get { return TestPartitionStartParameter.Value; }
-    }
-    public IntValue TestPartitionEnd {
-      get { return TestPartitionEndParameter.Value; }
+    public IntRange TestPartition {
+      get { return TestPartitionParameter.Value; }
     }
 
     public IEnumerable<int> TrainingIndizes {
       get {
-        return Enumerable.Range(TrainingPartitionStart.Value, TrainingPartitionEnd.Value - TrainingPartitionStart.Value)
-                         .Where(i => i >= 0 && i < Dataset.Rows && (i < TestPartitionStart.Value || TestPartitionEnd.Value <= i));
+        return Enumerable.Range(TrainingPartition.Start, TrainingPartition.End - TrainingPartition.Start)
+                         .Where(i => i >= 0 && i < Dataset.Rows && (i < TestPartition.Start || TestPartition.End <= i));
       }
     }
     public IEnumerable<int> TestIndizes {
       get {
-        return Enumerable.Range(TestPartitionStart.Value, TestPartitionEnd.Value - TestPartitionStart.Value)
+        return Enumerable.Range(TestPartition.Start, TestPartition.End - TestPartition.Start)
            .Where(i => i >= 0 && i < Dataset.Rows);
       }
@@ -121 +107 @@
       Parameters.Add(new FixedValueParameter<Dataset>(DatasetParameterName, "", dataset));
       Parameters.Add(new FixedValueParameter<ICheckedItemList<StringValue>>(InputVariablesParameterName, "", inputVariables.AsReadOnly()));
-      Parameters.Add(new FixedValueParameter<IntValue>(TrainingPartitionStartParameterName, "", new IntValue(trainingPartitionStart)));
-      Parameters.Add(new FixedValueParameter<IntValue>(TrainingPartitionEndParameterName, "", new IntValue(trainingPartitionEnd)));
-      Parameters.Add(new FixedValueParameter<IntValue>(TestPartitionStartParameterName, "", new IntValue(testPartitionStart)));
-      Parameters.Add(new FixedValueParameter<IntValue>(TestPartitionEndParameterName, "", new IntValue(testPartitionEnd)));
+      Parameters.Add(new FixedValueParameter<IntRange>(TrainingPartitionParameterName, "", new IntRange(trainingPartitionStart, trainingPartitionEnd)));
+      Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", new IntRange(testPartitionStart, testPartitionEnd)));
 
       ((ValueParameter<Dataset>)DatasetParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
@@ -133 +117 @@
       DatasetParameter.ValueChanged += new EventHandler(Parameter_ValueChanged);
       InputVariables.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<StringValue>>(InputVariables_CheckedItemsChanged);
-      TrainingPartitionStart.ValueChanged += new EventHandler(Parameter_ValueChanged);
-      TrainingPartitionEnd.ValueChanged += new EventHandler(Parameter_ValueChanged);
-      TestPartitionStart.ValueChanged += new EventHandler(Parameter_ValueChanged);
-      TestPartitionEnd.ValueChanged += new EventHandler(Parameter_ValueChanged);
+      TrainingPartition.ValueChanged += new EventHandler(Parameter_ValueChanged);
+      TestPartition.ValueChanged += new EventHandler(Parameter_ValueChanged);
     }
 

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

@@ -31 +31 @@
     IEnumerable<string> AllowedInputVariables { get; }
 
-    IntValue TrainingPartitionStart { get; }
-    IntValue TrainingPartitionEnd { get; }
-    IntValue TestPartitionStart { get; }
-    IntValue TestPartitionEnd { get; }
+    IntRange TrainingPartition { get; }
+    IntRange TestPartition { get; }
 
     IEnumerable<int> TrainingIndizes { get; }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineLinearScalingParameterCalculator.cs

@@ -78 +78 @@
     /// </summary>
     public void Add(double original, double target) {
-      // validity of values is checked in mean clculator and covariance calculator
+      // validity of values is checked in mean calculator and covariance calculator
       targetMeanCalculator.Add(target);
       originalMeanAndVarianceCalculator.Add(original);