Changeset 17980 for branches/2719_HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Datastream.cs

Timestamp:

05/10/21 09:48:16 (3 years ago)

Author:

jzenisek

Message:

#2719 merged head of HeuristicLab.Problems.DataAnalysis into branch; added several minor items

Location:

branches/2719_HeuristicLab.DatastreamAnalysis

Files:

• . (modified) (1 prop)
• HeuristicLab.DatastreamAnalysis/3.4/Datastream.cs (modified) (8 diffs)

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

@@ -1 +1 @@
 #region License Information
+
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -18 +19 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #endregion
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.DatastreamAnalysis {
-  [StorableClass]
   [Item("Datastream", "Represents an item containing a data source and reading options for a certain data stream.")]
+  [StorableType("91B9B2A6-D043-4FA0-9402-DF382B4B4D77")]
   [Creatable(CreatableAttribute.Categories.Problems)]
   public class Datastream : ParameterizedNamedItem, IDatastream {
@@ -47 +46 @@
     protected const string SlidingWindowSonarRatioParameterName = "SlidingWindowSonarRatio";
     protected const string SlidingWindowEvaluationSchemeParameterName = "SlidingWindowEvaluationScheme";
+    protected const string EvaluationHorizonParameterName = "EvaluationHorizon";
+    protected const string RollingEvaluationHorizonParameterName = "RollingEvaluationHorizon";
 
     #region parameter properites
@@ -93 +94 @@
         return (IValueParameter<EnumValue<EvaluationScheme>>)Parameters[SlidingWindowEvaluationSchemeParameterName];
       }
+    }
+
+    public IValueParameter<IntValue> EvaluationHorizonParameter 
+    {
+      get { return (IValueParameter<IntValue>)Parameters[EvaluationHorizonParameterName]; }
+    }
+
+    public IValueParameter<BoolValue> RollingEvaluationHorizonParameter 
+    {
+      get { return (IValueParameter<BoolValue>)Parameters[RollingEvaluationHorizonParameterName]; }
     }
 
@@ -154 +165 @@
       get { return SlidingWindowEvaluationSchemeParameter.Value; }
       set { SlidingWindowEvaluationSchemeParameter.Value = value; }
+    }
+
+    public IntValue EvaluationHorizon 
+    {
+      get { return EvaluationHorizonParameter.Value; }
+      set { EvaluationHorizonParameter.Value = value; }
+    }
+
+    public BoolValue RollingEvaluationHorizon 
+    {
+      get { return RollingEvaluationHorizonParameter.Value; }
+      set { RollingEvaluationHorizonParameter.Value = value; }
     }
 
@@ -185 +208 @@
       {
         //return ProblemData != null && ProblemData.Dataset != null && ProblemData.Dataset.Rows > 0 && FitnessPartition.Size > 0;
-        return FitnessPartition.Size > 0;
+        return FitnessPartition.Size >= 0;
       }
     }
@@ -219 +242 @@
     #region constructors
     [StorableConstructor]
-    protected Datastream(bool deserializing) : base(deserializing) { }
+    protected Datastream(StorableConstructorFlag _) : base(_) { }
 
     [StorableHook(HookType.AfterDeserialization)]
@@ -239 +262 @@
       Parameters.Add(new ValueParameter<RegressionProblemData>(ProblemDataParameterName, "ProblemData for analysis with selected ensembles.", null));
       Parameters.Add(new FixedValueParameter<StringValue>(DataSourceAddressParameterName, "Source address of data stream", new StringValue("")));
-      Parameters.Add(new FixedValueParameter<IntRange>(InitialSlidingWindowParameterName, "Initial sliding window boundaries", new IntRange(0, 100)));
-      Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowSizeParameterName, "Sliding window size", new IntValue(100)));
+      Parameters.Add(new FixedValueParameter<IntRange>(InitialSlidingWindowParameterName, "Initial sliding window boundaries", new IntRange(0, 10)));
+      Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowSizeParameterName, "Sliding window size", new IntValue(10)));
       Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowStepWidthParameterName, "Sliding window step width", new IntValue(1)));
       Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowMovementDelayParameterName, "Sliding window movement delay interval (milliseconds)", new IntValue(0)));
-      Parameters.Add(new FixedValueParameter<DoubleValue>(SlidingWindowSonarRatioParameterName, "Sliding window sonar ratio", new DoubleValue(0.25)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>(SlidingWindowSonarRatioParameterName, "Sliding window sonar ratio", new DoubleValue(0.0)));
       Parameters.Add(new FixedValueParameter<EnumValue<EvaluationScheme>>(SlidingWindowEvaluationSchemeParameterName, "Sliding window evaluation scheme", new EnumValue<EvaluationScheme>(EvaluationScheme.none)));
+      Parameters.Add(new FixedValueParameter<IntValue>(EvaluationHorizonParameterName, "Evaluation Horizon", new IntValue(1)));
+      Parameters.Add(new ValueParameter<BoolValue>(RollingEvaluationHorizonParameterName, "Rolling Evalution Horizon", new BoolValue(false)));
       RegisterParameterEvents();
       InitializeState();