Changeset 4556 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3
- Timestamp:
- 10/05/10 16:35:16 (14 years ago)
- Location:
- branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3
- Files:
-
- 4 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views-3.3.csproj
r4463 r4556 91 91 </PropertyGroup> 92 92 <ItemGroup> 93 <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" /> 93 94 <Reference Include="System" /> 94 95 <Reference Include="System.Core"> … … 108 109 </ItemGroup> 109 110 <ItemGroup> 111 <Compile Include="PrognosisView.cs"> 112 <SubType>UserControl</SubType> 113 </Compile> 114 <Compile Include="PrognosisView.Designer.cs"> 115 <DependentUpon>PrognosisView.cs</DependentUpon> 116 </Compile> 110 117 <Compile Include="HeuristicLabProblemsDataAnalysisMultiVariateTimeSeriesPrognosisViewsPlugin.cs" /> 111 118 <Compile Include="InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.cs"> … … 114 121 <Compile Include="InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.Designer.cs"> 115 122 <DependentUpon>InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.cs</DependentUpon> 123 </Compile> 124 <Compile Include="TimeSeriesPrognosisLineChartView.cs"> 125 <SubType>UserControl</SubType> 126 </Compile> 127 <Compile Include="TimeSeriesPrognosisLineChartView.Designer.cs"> 128 <DependentUpon>TimeSeriesPrognosisLineChartView.cs</DependentUpon> 116 129 </Compile> 117 130 <Compile Include="ResultsView.cs"> … … 206 219 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project> 207 220 <Name>HeuristicLab.Operators-3.3</Name> 221 </ProjectReference> 222 <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj"> 223 <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project> 224 <Name>HeuristicLab.Optimization.Views-3.3</Name> 208 225 </ProjectReference> 209 226 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3/ResultsView.cs
r4457 r4556 155 155 List<string> targetVariables = Content.ProblemData.TargetVariables.CheckedItems.Select(x => x.Value.Value).ToList(); 156 156 157 int timestep = 0; 158 foreach (double[] x in Content.GetPrognosis(row)) { 159 int targetIndex = 0; 160 foreach (var targetVariable in targetVariables) { 161 double originalValue = Content.ProblemData.Dataset[targetVariable, row + timestep]; 162 double estimatedValue = x[targetIndex]; 163 if (IsValidValue(originalValue) && IsValidValue(estimatedValue)) { 164 foreach (IOnlineEvaluator evaluator in evaluators[targetVariable]) { 165 evaluator.Add(originalValue, estimatedValue); 157 if (string.IsNullOrEmpty(Content.ConditionalEvaluationVariable) || 158 Content.ProblemData.Dataset[Content.ConditionalEvaluationVariable, row] > 0) { 159 int timestep = 0; 160 foreach (double[] x in Content.GetPrognosis(row)) { 161 int targetIndex = 0; 162 if (row + timestep < Content.ProblemData.Dataset.Rows) { 163 foreach (var targetVariable in targetVariables) { 164 double originalValue = Content.ProblemData.Dataset[targetVariable, row + timestep]; 165 double estimatedValue = x[targetIndex]; 166 if (IsValidValue(originalValue) && IsValidValue(estimatedValue)) { 167 foreach (IOnlineEvaluator evaluator in evaluators[targetVariable]) { 168 evaluator.Add(originalValue, estimatedValue); 169 } 170 } 171 targetIndex++; 166 172 } 167 173 } 168 t argetIndex++;174 timestep++; 169 175 } 170 timestep++;171 176 } 172 177 }
Note: See TracChangeset
for help on using the changeset viewer.