Changeset 4401
- Timestamp:
- 09/15/10 21:11:11 (14 years ago)
- Location:
- branches/DataAnalysis
- Files:
-
- 10 added
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataAnalysis/HeuristicLab 3.3.sln
r4235 r4401 89 89 {6024D74F-E29C-4E6B-843E-8851831B8E14} = {6024D74F-E29C-4E6B-843E-8851831B8E14} 90 90 {3EAF1454-086D-44A2-8509-B1BA24DB1865} = {3EAF1454-086D-44A2-8509-B1BA24DB1865} 91 {2C429157-9C34-4DD3-9D5F-B444B751E39A} = {2C429157-9C34-4DD3-9D5F-B444B751E39A}92 91 {3BD61258-31DA-4B09-89C0-4F71FEF5F05A} = {3BD61258-31DA-4B09-89C0-4F71FEF5F05A} 93 92 {01BBCB5A-144A-4A7E-908E-079849E2F7CF} = {01BBCB5A-144A-4A7E-908E-079849E2F7CF} … … 113 112 {9B6EA19A-F894-4E00-B5A3-970514284772} = {9B6EA19A-F894-4E00-B5A3-970514284772} 114 113 {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58} = {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58} 115 {15452B9F-A436-4139-8EE7-DA72FB8D3664} = {15452B9F-A436-4139-8EE7-DA72FB8D3664}116 114 {DE12659F-87C4-48E6-B2E3-4E73DD95A540} = {DE12659F-87C4-48E6-B2E3-4E73DD95A540} 117 115 {4FE983A1-AAF8-4977-B9E2-52B3224510CB} = {4FE983A1-AAF8-4977-B9E2-52B3224510CB} … … 261 259 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.Tests", "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\Tests\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.Tests.csproj", "{8824925E-3E00-4543-8293-7DDACE4737F8}" 262 260 EndProject 263 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3", "HeuristicLab.Algorithms.ParticleSwarmOptimization\3.3\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj", "{2C429157-9C34-4DD3-9D5F-B444B751E39A}"264 EndProject265 261 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Views-3.3", "HeuristicLab.Problems.DataAnalysis.Views\3.3\HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj", "{799B0B38-E384-4A17-A73C-F211EB854592}" 266 262 EndProject … … 314 310 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm.WindowsForms-3.3.Tests", "HeuristicLab.MainForm.WindowsForms\3.3\Tests\HeuristicLab.MainForm.WindowsForms-3.3.Tests.csproj", "{9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}" 315 311 EndProject 316 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.NSGA2-3.3", "HeuristicLab.Algorithms.NSGA2\3.3\HeuristicLab.Algorithms.NSGA2-3.3.csproj", "{15452B9F-A436-4139-8EE7-DA72FB8D3664}"317 EndProject318 312 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.MultiVariate-3.3", "HeuristicLab.Problems.DataAnalysis.MultiVariate\3.3\HeuristicLab.Problems.DataAnalysis.MultiVariate-3.3.csproj", "{2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}" 319 313 EndProject … … 331 325 EndProject 332 326 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3", "HeuristicLab.Problems.ExternalEvaluation.GP.Views\3.3\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj", "{1778134B-866B-4CB3-BFC0-52B2FAAA5777}" 327 EndProject 328 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Common-3.3", "HeuristicLab.Clients.Common\3.3\HeuristicLab.Clients.Common-3.3.csproj", "{730A9104-D4D1-4360-966B-E49B7571DDA3}" 333 329 EndProject 334 330 Global … … 1577 1573 {8824925E-3E00-4543-8293-7DDACE4737F8}.Silverlight2|x86.ActiveCfg = Release|x86 1578 1574 {8824925E-3E00-4543-8293-7DDACE4737F8}.Silverlight2|x86.Build.0 = Release|x86 1579 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU1580 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|Any CPU.Build.0 = Debug|Any CPU1581 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|x64.ActiveCfg = Debug|x641582 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|x64.Build.0 = Debug|x641583 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|x86.ActiveCfg = Debug|x861584 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|x86.Build.0 = Debug|x861585 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|Any CPU.ActiveCfg = Release|Any CPU1586 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|Any CPU.Build.0 = Release|Any CPU1587 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x64.ActiveCfg = Release|x641588 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x64.Build.0 = Release|x641589 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x86.ActiveCfg = Release|x861590 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x86.Build.0 = Release|x861591 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|Any CPU.ActiveCfg = Release|Any CPU1592 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x64.ActiveCfg = Release|x641593 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x86.ActiveCfg = Release|x861594 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Silverlight2|Any CPU.ActiveCfg = Release|x641595 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Silverlight2|x64.ActiveCfg = Release|x641596 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Silverlight2|x64.Build.0 = Release|x641597 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Silverlight2|x86.ActiveCfg = Release|x641598 1575 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1599 1576 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 2044 2021 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Silverlight2|x64.ActiveCfg = Release|Any CPU 2045 2022 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Silverlight2|x86.ActiveCfg = Release|Any CPU 2046 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU2047 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Debug|Any CPU.Build.0 = Debug|Any CPU2048 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Debug|x64.ActiveCfg = Debug|x642049 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Debug|x64.Build.0 = Debug|x642050 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Debug|x86.ActiveCfg = Debug|x862051 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Debug|x86.Build.0 = Debug|x862052 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Release|Any CPU.ActiveCfg = Release|Any CPU2053 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Release|Any CPU.Build.0 = Release|Any CPU2054 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Release|x64.ActiveCfg = Release|x642055 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Release|x64.Build.0 = Release|x642056 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Release|x86.ActiveCfg = Release|x862057 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Release|x86.Build.0 = Release|x862058 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Services|Any CPU.ActiveCfg = Release|Any CPU2059 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Services|Any CPU.Build.0 = Release|Any CPU2060 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Services|x64.ActiveCfg = Release|Any CPU2061 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Services|x86.ActiveCfg = Release|Any CPU2062 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Silverlight2|Any CPU.ActiveCfg = Release|Any CPU2063 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Silverlight2|Any CPU.Build.0 = Release|Any CPU2064 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Silverlight2|x64.ActiveCfg = Release|Any CPU2065 {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Silverlight2|x86.ActiveCfg = Release|Any CPU2066 2023 {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 2067 2024 {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 2224 2181 {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Silverlight2|x64.Build.0 = Release|x64 2225 2182 {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Silverlight2|x86.ActiveCfg = Release|x64 2183 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 2184 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|Any CPU.Build.0 = Debug|Any CPU 2185 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|x64.ActiveCfg = Debug|x64 2186 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|x64.Build.0 = Debug|x64 2187 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|x86.ActiveCfg = Debug|x86 2188 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|x86.Build.0 = Debug|x86 2189 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|Any CPU.ActiveCfg = Release|Any CPU 2190 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|Any CPU.Build.0 = Release|Any CPU 2191 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|x64.ActiveCfg = Release|x64 2192 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|x64.Build.0 = Release|x64 2193 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|x86.ActiveCfg = Release|x86 2194 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|x86.Build.0 = Release|x86 2195 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Services|Any CPU.ActiveCfg = Release|x86 2196 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Services|x64.ActiveCfg = Release|x86 2197 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Services|x86.ActiveCfg = Release|x86 2198 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Services|x86.Build.0 = Release|x86 2199 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Silverlight2|Any CPU.ActiveCfg = Release|x86 2200 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Silverlight2|x64.ActiveCfg = Release|x86 2201 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Silverlight2|x86.ActiveCfg = Release|x86 2202 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Silverlight2|x86.Build.0 = Release|x86 2226 2203 EndGlobalSection 2227 2204 GlobalSection(SolutionProperties) = preSolution -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/MultiObjectiveSymbolicVectorRegressionEvaluator.cs
r4197 r4401 64 64 int end = SamplesEnd.Value; 65 65 66 IEnumerable<int> rows = GenerateRowsToEvaluate( (uint)Random.Next(), RelativeNumberOfEvaluatedSamples.Value, start, end);66 IEnumerable<int> rows = GenerateRowsToEvaluate(Random.Next(), RelativeNumberOfEvaluatedSamples.Value, start, end); 67 67 68 68 QualitiesParameter.ActualValue = new DoubleArray(Evaluate(tree, interpreter, problemData, selectedTargetVariables, rows, LowerEstimationLimit, UpperEstimationLimit)); -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SingleObjectiveSymbolicVectorRegressionEvaluator.cs
r4197 r4401 64 64 int end = SamplesEnd.Value; 65 65 66 IEnumerable<int> rows = GenerateRowsToEvaluate( (uint)Random.Next(), RelativeNumberOfEvaluatedSamples.Value, start, end);66 IEnumerable<int> rows = GenerateRowsToEvaluate(Random.Next(), RelativeNumberOfEvaluatedSamples.Value, start, end); 67 67 68 68 QualityParameter.ActualValue = new DoubleValue(Evaluate(tree, interpreter, problemData, selectedTargetVariables, rows, LowerEstimationLimit, UpperEstimationLimit)); -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SymbolicVectorRegressionEvaluator.cs
r4194 r4401 119 119 } 120 120 121 public static IEnumerable<int> GenerateRowsToEvaluate( uint seed, double relativeAmount, int start, int end) {121 public static IEnumerable<int> GenerateRowsToEvaluate(int seed, double relativeAmount, int start, int end) { 122 122 if (end < start) throw new ArgumentException("Start value is larger than end value."); 123 123 int count = (int)((end - start) * relativeAmount); -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/SymbolicVectorRegressionGrammar.cs
r4068 r4401 39 39 } 40 40 41 protected SymbolicVectorRegressionGrammar(SymbolicVectorRegressionGrammar original) : base(original) { } 41 protected SymbolicVectorRegressionGrammar(SymbolicVectorRegressionGrammar original) : base(original.Dimension) { 42 // fill ??? 43 } 42 44 43 45 private void Initialize() { -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views-3.3.csproj
r4113 r4401 109 109 <ItemGroup> 110 110 <Compile Include="HeuristicLabProblemsDataAnalysisMultiVariateTimeSeriesPrognosisViewsPlugin.cs" /> 111 <Compile Include="ResultsView.cs"> 112 <SubType>UserControl</SubType> 113 </Compile> 114 <Compile Include="ResultsView.Designer.cs"> 115 <DependentUpon>ResultsView.cs</DependentUpon> 116 </Compile> 117 <Compile Include="SymbolicTimeSeriesPrognosisModelView.cs"> 118 <SubType>UserControl</SubType> 119 </Compile> 120 <Compile Include="SymbolicTimeSeriesPrognosisModelView.designer.cs"> 121 <DependentUpon>SymbolicTimeSeriesPrognosisModelView.cs</DependentUpon> 122 </Compile> 111 123 <Compile Include="Symbols\DerivativeVariableView.cs"> 112 124 <SubType>UserControl</SubType> … … 133 145 </ItemGroup> 134 146 <ItemGroup> 147 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 148 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> 149 <Name>HeuristicLab.Collections-3.3</Name> 150 </ProjectReference> 135 151 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 136 152 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> … … 148 164 <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project> 149 165 <Name>HeuristicLab.Data.Views-3.3</Name> 166 </ProjectReference> 167 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> 168 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project> 169 <Name>HeuristicLab.Data-3.3</Name> 150 170 </ProjectReference> 151 171 <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj"> -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis-3.3.csproj
r4113 r4401 108 108 <Compile Include="HeuristicLabProblemsDataAnalysisMultiVariateTimeSeriesPrognosisPlugin.cs" /> 109 109 <Compile Include="Symbolic\Analyzer\ValidationBestScaledSymbolicTimeSeriesPrognosisSolutionAnalyzer.cs" /> 110 <Compile Include="Symbolic\SymbolicTimeSeriesPrognosisSolution.cs" /> 111 <Compile Include="Symbolic\SymbolicTimeSeriesPrognosisModel.cs" /> 110 112 <Compile Include="Symbolic\Evaluators\SymbolicTimeSeriesPrognosisNormalizedMseEvaluator.cs" /> 111 113 <Compile Include="Symbolic\Evaluators\SymbolicTimeSeriesPrognosisScaledNormalizedMseEvaluator.cs" /> -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Analyzer/ValidationBestScaledSymbolicTimeSeriesPrognosisSolutionAnalyzer.cs
r4113 r4401 152 152 get { return (IValueLookupParameter<IntValue>)Parameters[PredictionHorizonParameterName]; } 153 153 } 154 public ILookupParameter<Symbolic ExpressionTree> BestSolutionParameter {155 get { return (ILookupParameter<Symbolic ExpressionTree>)Parameters[BestSolutionParameterName]; }154 public ILookupParameter<SymbolicTimeSeriesPrognosisSolution> BestSolutionParameter { 155 get { return (ILookupParameter<SymbolicTimeSeriesPrognosisSolution>)Parameters[BestSolutionParameterName]; } 156 156 } 157 157 public ILookupParameter<IntValue> GenerationsParameter { … … 239 239 Parameters.Add(new ValueLookupParameter<DoubleArray>(UpperEstimationLimitParameterName, "The upper estimation limit that was set for the evaluation of the symbolic expression trees.")); 240 240 Parameters.Add(new ValueLookupParameter<DoubleArray>(LowerEstimationLimitParameterName, "The lower estimation limit that was set for the evaluation of the symbolic expression trees.")); 241 Parameters.Add(new LookupParameter<Symbolic ExpressionTree>(BestSolutionParameterName, "The best symbolic time series prognosis solution."));241 Parameters.Add(new LookupParameter<SymbolicTimeSeriesPrognosisSolution>(BestSolutionParameterName, "The best symbolic time series prognosis solution.")); 242 242 Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "The number of generations calculated so far.")); 243 243 Parameters.Add(new LookupParameter<DoubleValue>(BestSolutionQualityParameterName, "The quality of the best symbolic regression solution.")); … … 274 274 int validationEnd = ValidationSamplesEnd.Value; 275 275 int rowCount = (int)Math.Ceiling((validationEnd - validationStart) * RelativeNumberOfEvaluatedSamples.Value); 276 IEnumerable<int> rows = RandomEnumerable.SampleRandomNumbers( (uint)Random.Next(), validationStart, validationEnd, rowCount);276 IEnumerable<int> rows = RandomEnumerable.SampleRandomNumbers(Random.Next(), validationStart, validationEnd, rowCount); 277 277 double bestValidationNmse = double.MaxValue; 278 278 SymbolicExpressionTree bestTree = null; … … 291 291 292 292 if (BestSolutionQualityParameter.ActualValue == null || BestSolutionQualityParameter.ActualValue.Value > bestValidationNmse) { 293 var solution = bestTree; 294 //solution.Name = BestSolutionParameterName; 295 //solution.Description = "Best solution on validation partition found over the whole run."; 293 var model = new SymbolicTimeSeriesPrognosisModel((ISymbolicTimeSeriesExpressionInterpreter)SymbolicExpressionTreeInterpreter.Clone(), bestTree); 294 model.Name = "Time series prognosis model"; 295 model.Description = "Best solution on validation partition found over the whole run."; 296 297 var solution = new SymbolicTimeSeriesPrognosisSolution(ProblemData, model, PredictionHorizon.Value); 298 solution.Name = BestSolutionParameterName; 299 solution.Description = "Best solution on validation partition found over the whole run."; 296 300 297 301 BestSolutionParameter.ActualValue = solution; -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Evaluators/SymbolicTimeSeriesPrognosisNormalizedMseEvaluator.cs
r4113 r4401 149 149 string conditionVariableName = ConditionVariableName == null ? null : ConditionVariableName.Value; 150 150 int nRows = (int)Math.Ceiling((SamplesEnd.Value - SamplesStart.Value) * RelativeNumberOfEvaluatedSamples.Value); 151 IEnumerable<int> rows = RandomEnumerable.SampleRandomNumbers( (uint)Random.Next(), SamplesStart.Value, SamplesEnd.Value, nRows);151 IEnumerable<int> rows = RandomEnumerable.SampleRandomNumbers(Random.Next(), SamplesStart.Value, SamplesEnd.Value, nRows); 152 152 153 153 quality = Evaluate(TimeSeriesPrognosisModel, ProblemData, TimeSeriesExpressionInterpreter, -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Evaluators/SymbolicTimeSeriesPrognosisScaledNormalizedMseEvaluator.cs
r4113 r4401 162 162 int nRows = (int)Math.Ceiling((SamplesEnd.Value - SamplesStart.Value) * RelativeNumberOfEvaluatedSamples.Value); 163 163 164 IEnumerable<int> rows = RandomEnumerable.SampleRandomNumbers( (uint)Random.Next(), SamplesStart.Value, SamplesEnd.Value, nRows);164 IEnumerable<int> rows = RandomEnumerable.SampleRandomNumbers(Random.Next(), SamplesStart.Value, SamplesEnd.Value, nRows); 165 165 CalculateScalingParameters(TimeSeriesPrognosisModel, ProblemData, TimeSeriesExpressionInterpreter, 166 166 conditionVariableName, rows, -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Views/3.3/HeuristicLab.Problems.DataAnalysis.MultiVariate.Views-3.3.csproj
r4079 r4401 111 111 <None Include="HeuristicLabProblemsDataAnalysisMultiVariateViewsPlugin.cs.frame" /> 112 112 <None Include="Properties\AssemblyInfo.frame" /> 113 <Compile Include="EstimatedValuesView.cs"> 114 <SubType>UserControl</SubType> 115 </Compile> 116 <Compile Include="EstimatedValuesView.Designer.cs"> 117 <DependentUpon>EstimatedValuesView.cs</DependentUpon> 118 </Compile> 119 <Compile Include="LineChartView.cs"> 120 <SubType>UserControl</SubType> 121 </Compile> 122 <Compile Include="LineChartView.Designer.cs"> 123 <DependentUpon>LineChartView.cs</DependentUpon> 124 </Compile> 125 <Compile Include="MultiVariateDataAnalysisSolutionView.cs"> 126 <SubType>UserControl</SubType> 127 </Compile> 128 <Compile Include="MultiVariateDataAnalysisSolutionView.Designer.cs"> 129 <DependentUpon>MultiVariateDataAnalysisSolutionView.cs</DependentUpon> 130 </Compile> 113 131 <Compile Include="HeuristicLabProblemsDataAnalysisMultiVariateViewsPlugin.cs" /> 114 132 <Compile Include="MultiVariateDataAnalysisProblemDataView.cs"> … … 121 139 </ItemGroup> 122 140 <ItemGroup> 141 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 142 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> 143 <Name>HeuristicLab.Collections-3.3</Name> 144 </ProjectReference> 123 145 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 124 146 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> … … 137 159 <Name>HeuristicLab.Data.Views-3.3</Name> 138 160 </ProjectReference> 161 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> 162 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project> 163 <Name>HeuristicLab.Data-3.3</Name> 164 </ProjectReference> 139 165 <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj"> 140 166 <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project> … … 156 182 <Project>{2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}</Project> 157 183 <Name>HeuristicLab.Problems.DataAnalysis.MultiVariate-3.3</Name> 184 </ProjectReference> 185 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj"> 186 <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project> 187 <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name> 158 188 </ProjectReference> 159 189 </ItemGroup> -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/Interfaces/IMultiVariateDataAnalysisModel.cs
r4068 r4401 21 21 22 22 using HeuristicLab.Core; 23 using System.Collections.Generic; 23 24 24 25 namespace HeuristicLab.Problems.DataAnalysis.MultiVariate { 25 26 public interface IMultiVariateDataAnalysisModel : INamedItem { 27 IEnumerable<double[]> GetEstimatedValues(MultiVariateDataAnalysisProblemData problemData, int start, int end); 26 28 } 27 29 } -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/Interfaces/IMultiVariateDataAnalysisSolution.cs
r4068 r4401 21 21 22 22 using HeuristicLab.Core; 23 using System.Collections.Generic; 24 using System; 23 25 24 26 namespace HeuristicLab.Problems.DataAnalysis.MultiVariate { 25 27 public interface IMultiVariateDataAnalysisSolution : INamedItem { 28 event EventHandler ProblemDataChanged; 29 event EventHandler ModelChanged; 30 31 MultiVariateDataAnalysisProblemData ProblemData { get; set; } 32 IMultiVariateDataAnalysisModel Model { get; } 33 34 IEnumerable<double[]> EstimatedValues { get; } 35 IEnumerable<double[]> EstimatedTrainingValues { get; } 36 IEnumerable<double[]> EstimatedTestValues { get; } 37 26 38 } 27 39 } -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs
r4341 r4401 35 35 [StorableClass] 36 36 public sealed class SymbolicRegressionSolution : DataAnalysisSolution { 37 public SymbolicRegressionSolution() : base() { } 37 [StorableConstructor] 38 public SymbolicRegressionSolution(bool deserializing) : base(deserializing) { } 38 39 public SymbolicRegressionSolution(DataAnalysisProblemData problemData, SymbolicRegressionModel model, double lowerEstimationLimit, double upperEstimationLimit) 39 40 : base(problemData, lowerEstimationLimit, upperEstimationLimit) { -
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs
r4193 r4401 46 46 47 47 [StorableConstructor] 48 pr ivateDataAnalysisSolution(bool deserializing) : base(deserializing) { }48 protected DataAnalysisSolution(bool deserializing) : base(deserializing) { } 49 49 [StorableHook(HookType.AfterDeserialization)] 50 50 private void Initialize() {
Note: See TracChangeset
for help on using the changeset viewer.