Changeset 4556 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views

Timestamp:

10/05/10 16:35:16 (14 years ago)

Author:

gkronber

Message:

Added classes and views for analysis of symbolic time series prognosis results. #1142

Location:

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3

Files:

• HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views-3.3.csproj (modified) (4 diffs)
• PrognosisView.Designer.cs (added)
• PrognosisView.cs (added)
• ResultsView.cs (modified) (1 diff)
• TimeSeriesPrognosisLineChartView.Designer.cs (added)
• TimeSeriesPrognosisLineChartView.cs (added)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views-3.3.csproj

@@ -91 +91 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -108 +109 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="PrognosisView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PrognosisView.Designer.cs">
+      <DependentUpon>PrognosisView.cs</DependentUpon>
+    </Compile>
     <Compile Include="HeuristicLabProblemsDataAnalysisMultiVariateTimeSeriesPrognosisViewsPlugin.cs" />
     <Compile Include="InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.cs">
@@ -114 +121 @@
     <Compile Include="InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.Designer.cs">
       <DependentUpon>InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="TimeSeriesPrognosisLineChartView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TimeSeriesPrognosisLineChartView.Designer.cs">
+      <DependentUpon>TimeSeriesPrognosisLineChartView.cs</DependentUpon>
     </Compile>
     <Compile Include="ResultsView.cs">
@@ -206 +219 @@
       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
       <Name>HeuristicLab.Operators-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
+      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
+      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3/ResultsView.cs

@@ -155 +155 @@
           List<string> targetVariables = Content.ProblemData.TargetVariables.CheckedItems.Select(x => x.Value.Value).ToList();
 
-          int timestep = 0;
-          foreach (double[] x in Content.GetPrognosis(row)) {
-            int targetIndex = 0;
-            foreach (var targetVariable in targetVariables) {
-              double originalValue = Content.ProblemData.Dataset[targetVariable, row + timestep];
-              double estimatedValue = x[targetIndex];
-              if (IsValidValue(originalValue) && IsValidValue(estimatedValue)) {
-                foreach (IOnlineEvaluator evaluator in evaluators[targetVariable]) {
-                  evaluator.Add(originalValue, estimatedValue);
+          if (string.IsNullOrEmpty(Content.ConditionalEvaluationVariable) ||
+            Content.ProblemData.Dataset[Content.ConditionalEvaluationVariable, row] > 0) {
+            int timestep = 0;
+            foreach (double[] x in Content.GetPrognosis(row)) {
+              int targetIndex = 0;
+              if (row + timestep < Content.ProblemData.Dataset.Rows) {
+                foreach (var targetVariable in targetVariables) {
+                  double originalValue = Content.ProblemData.Dataset[targetVariable, row + timestep];
+                  double estimatedValue = x[targetIndex];
+                  if (IsValidValue(originalValue) && IsValidValue(estimatedValue)) {
+                    foreach (IOnlineEvaluator evaluator in evaluators[targetVariable]) {
+                      evaluator.Add(originalValue, estimatedValue);
+                    }
+                  }
+                  targetIndex++;
                 }
               }
-              targetIndex++;
+              timestep++;
             }
-            timestep++;
           }
         }