Changeset 14538 for branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Datastream.cs

Timestamp:

01/03/17 23:04:56 (7 years ago)

Author:

jzenisek

Message:

#2719 enhanced the optimizer's functionality

File:

• branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Datastream.cs (modified) (10 diffs)

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Datastream.cs

@@ -43 +43 @@
     protected const string SlidingWindowStepWidthParameterName = "SlidingWindowStepWidth";
     protected const string SlidingWindowMovementIntervalParameterName = "SlidingWindowMovementInterval";
+    protected const string FitnessPartitionParameterName = "FitnessPartition";
 
     #region parameter properites
@@ -50 +51 @@
     }
 
-    public IFixedValueParameter<IntRange> InitialSlidingWindowParameter {
-      get { return (IFixedValueParameter<IntRange>) Parameters[InitialSlidingWindowParameterName]; }
-    }
-
-    public IFixedValueParameter<IntValue> SlidingWindowSizeParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[InitialSlidingWindowParameterName]; }
-    }
-
-    public IFixedValueParameter<IntValue> SlidingWindowStepWidthParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[SlidingWindowStepWidthParameterName]; }
-    }
-
-    public IFixedValueParameter<IntValue> SlidingWindowMovementIntervalParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[SlidingWindowMovementIntervalParameterName]; }
-    }
-
+    public IValueParameter<IntRange> InitialSlidingWindowParameter {
+      get { return (IValueParameter<IntRange>) Parameters[InitialSlidingWindowParameterName]; }
+    }
+
+    public IValueParameter<IntValue> SlidingWindowSizeParameter {
+      get { return (IValueParameter<IntValue>) Parameters[SlidingWindowSizeParameterName]; }
+    }
+
+    public IValueParameter<IntValue> SlidingWindowStepWidthParameter {
+      get { return (IValueParameter<IntValue>) Parameters[SlidingWindowStepWidthParameterName]; }
+    }
+
+    public IValueParameter<IntValue> SlidingWindowMovementIntervalParameter {
+      get { return (IValueParameter<IntValue>) Parameters[SlidingWindowMovementIntervalParameterName]; }
+    }
+
+    //public IValueParameter<IntRange> FitnessPartitionParameter {
+    //  get { return (IValueParameter<IntRange>) Parameters[FitnessPartitionParameterName]; }
+    //}
 
     #endregion
@@ -75 +79 @@
       set {
         if(value == null) throw new ArgumentNullException("problemData", "The provided value for the problemData is null.");
-        if (value == ProblemData) return;
         ProblemDataParameter.Value = value;
-      }
-    }
+        //OnProblemDataChanged();
+      }
+    }
+    
 
     public IntRange InitialSlidingWindow {
       get { return InitialSlidingWindowParameter.Value; }
+      set { InitialSlidingWindowParameter.Value = value; }
     }
 
     public IntValue SlidingWindowSize {
       get { return SlidingWindowSizeParameter.Value; }
+      set { SlidingWindowSizeParameter.Value = value; }
     }
 
     public IntValue SlidingWindowStepWidth {
       get { return SlidingWindowStepWidthParameter.Value; }
+      set { SlidingWindowStepWidthParameter.Value = value; }
     }
 
     public IntValue SlidingWindowMovementInterval {
       get { return SlidingWindowMovementIntervalParameter.Value; }
+      set { SlidingWindowMovementIntervalParameter.Value = value; }
     }
 
@@ -101 +110 @@
 
     public IntRange FitnessPartition { get; set; }
+
+    public bool UpdateAvailable {
+      get { return false; }
+    }
 
     public bool SlidingWindowMovementPossible {
       get {
         return ProblemData != null && ProblemData.Dataset != null &&
-               FitnessPartition.End + SlidingWindowStepWidth.Value <= ProblemData.Dataset.Rows;
-        // TODO: add external datastream, hub, etc to condition
+               (
+                (FitnessPartition.End + SlidingWindowStepWidth.Value <= ProblemData.Dataset.Rows) // shift end
+                || (FitnessPartition.Size > SlidingWindowSize.Value && (FitnessPartition.Start + SlidingWindowStepWidth.Value) < FitnessPartition.End) // shift start
+               );
       }
     }
@@ -112 +127 @@
     public bool SlidingWindowEvaluationPossible {
       get {
-        return ProblemData != null && ProblemData.Dataset != null &&
-               FitnessPartition.Size > 0;
+        //return ProblemData != null && ProblemData.Dataset != null && ProblemData.Dataset.Rows > 0 && FitnessPartition.Size > 0;
+        return FitnessPartition.Size > 0;
       }
     }
@@ -120 +135 @@
       if (ProblemData?.Dataset == null || ProblemData.Dataset.Rows == 0) return false;
       if (FitnessPartition.End + SlidingWindowStepWidth.Value > ProblemData.Dataset.Rows) return false;
-      
-      if (FitnessPartition.Size > SlidingWindowSize.Value) {
-        FitnessPartition.Start += SlidingWindowStepWidth.Value;
-      } else if (FitnessPartition.Size == SlidingWindowSize.Value) {
+
+      if (FitnessPartition.Size == SlidingWindowSize.Value) {
         FitnessPartition.Start += SlidingWindowStepWidth.Value;
         FitnessPartition.End += SlidingWindowStepWidth.Value;
-      } else {
+      } else { 
         FitnessPartition.End += SlidingWindowStepWidth.Value;
-      }   
+        FitnessPartition.Start += FitnessPartition.End - SlidingWindowSize.Value;
+      } 
+
+      //if (FitnessPartition.Size > SlidingWindowSize.Value) {
+      //  FitnessPartition.Start += SlidingWindowStepWidth.Value;
+      //} else if (FitnessPartition.Size == SlidingWindowSize.Value) {
+      //  FitnessPartition.Start += SlidingWindowStepWidth.Value;
+      //  FitnessPartition.End += SlidingWindowStepWidth.Value;
+      //} else {
+      //  FitnessPartition.End += SlidingWindowStepWidth.Value;
+      //  if (FitnessPartition.Size > SlidingWindowSize.Value) {
+      //    FitnessPartition.Start = FitnessPartition.End - FitnessPartition.Size;
+      //  }
+      //}   
       return true;
     }
@@ -141 +167 @@
     private void AfterDeserialization() {
       RegisterParameterEvents();
+      RecoverState();
     }
 
     protected Datastream(Datastream original, Cloner cloner) : base(original, cloner) {
       RegisterParameterEvents();
+      RecoverState();
     }
 
@@ -151 +179 @@
     }
 
-    public Datastream() {
+    public Datastream() : base() {
       Parameters.Add(new ValueParameter<RegressionProblemData>(ProblemDataParameterName, "ProblemData for analysis with selected ensembles.", null));
-      Parameters.Add(new FixedValueParameter<IntRange>(InitialSlidingWindowParameterName, "Initial sliding window boundaries", new IntRange(0, 1)));
-      Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowSizeParameterName, "Sliding window size", new IntValue(1)));
+      Parameters.Add(new FixedValueParameter<IntRange>(InitialSlidingWindowParameterName, "Initial sliding window boundaries", new IntRange(0, 5)));
+      Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowSizeParameterName, "Sliding window size", new IntValue(5)));
       Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowStepWidthParameterName, "Sliding window step width", new IntValue(1)));
-      Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowMovementIntervalParameterName, "Sliding window movement interval (milliseconds)", new IntValue(1000)));
+      Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowMovementIntervalParameterName, "Sliding window movement interval (milliseconds)", new IntValue(2000)));
+      RegisterParameterEvents();
       InitializeState();
     }
     #endregion
 
-
-    public void InitializeState() {
+    public void InitializeState(){
       if (ProblemData == null || ProblemData.Dataset == null || ProblemData.Dataset.Rows == 0) {
         FitnessPartition = new IntRange(0, 0);
@@ -173 +201 @@
     }
 
+    public void RecoverState() {
+      if (ProblemData == null || ProblemData.Dataset == null || ProblemData.Dataset.Rows == 0) {
+        FitnessPartition = new IntRange(0, 0);
+      } else {
+        if(FitnessPartition == null) FitnessPartition = (IntRange)InitialSlidingWindow.Clone();
+        if (FitnessPartition.End > ProblemData.Dataset.Rows) {
+          FitnessPartition.End = ProblemData.Dataset.Rows;
+        }
+      }
+    }
+
     public event EventHandler ProblemDataChanged;
-
+    public event EventHandler Reset;
+    public event EventHandler SlidingWindowChanged;
+
+
+    //protected virtual void OnProblemDataChanged() {
+    //  EventHandler handler = ProblemDataChanged;
+    //  if(handler != null) handler(this, EventArgs.Empty);
+    //}
+
+    //protected virtual void OnReset() {
+    //  EventHandler handler = Reset;
+    //  if (handler != null) handler(this, EventArgs.Empty);
+    //}
 
     private void RegisterParameterEvents() {
       ProblemDataParameter.ValueChanged += new EventHandler(ProblemData_ValueChanged);
+      //SlidingWindowSizeParameter.ValueChanged += new EventHandler(SlidingWindow_Changed);
+      InitialSlidingWindowParameter.ValueChanged += new EventHandler(SlidingWindow_Changed);
     }
 
@@ -183 +236 @@
       if (e == null) return;
 
+      InitializeState();
       DatastreamAnalysisUtil.RaiseEvent(this, ProblemDataChanged);
     }
 
+    private void SlidingWindow_Changed(object sender, EventArgs e) {
+      InitializeState();
+    }
+
+
+    // TODO
+    public IEnumerable<IParameterizedItem> ExecutionContextItems { get; }
     
-
   }
 }