- Timestamp:
- 03/28/19 11:22:24 (6 years ago)
- Location:
- branches/2988_ModelsOfModels2
- Files:
-
- 1 added
- 1 deleted
- 5 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Algorithms.DataAnalysis (added) merged: 16585,16625,16658,16661
- Property svn:mergeinfo changed
-
branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.DataAnalysis/3.4
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Algorithms.DataAnalysis/3.4 (added) merged: 16585,16625,16658,16661
- Property svn:mergeinfo changed
-
branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs
r16565 r16722 300 300 if ((ExecutionState != ExecutionState.Prepared) && (ExecutionState != ExecutionState.Paused)) 301 301 throw new InvalidOperationException(string.Format("Start not allowed in execution state \"{0}\".", ExecutionState)); 302 seed = new FastRandom().NextInt();302 seed = RandomSeedGenerator.GetSeed(); 303 303 304 304 if (Algorithm == null) return; -
branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessBase.cs
r16565 r16722 21 21 #endregion 22 22 23 using System.Linq;23 using HEAL.Attic; 24 24 using HeuristicLab.Algorithms.GradientDescent; 25 25 using HeuristicLab.Common; … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using HEAL.Attic;32 31 using HeuristicLab.Problems.DataAnalysis; 32 using System.Linq; 33 33 34 34 namespace HeuristicLab.Algorithms.DataAnalysis { -
branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj
r16568 r16722 43 43 <DebugType>full</DebugType> 44 44 <Optimize>false</Optimize> 45 <OutputPath> $(SolutionDir)\bin\</OutputPath>45 <OutputPath>..\..\..\..\trunk\bin\</OutputPath> 46 46 <DefineConstants>DEBUG;TRACE</DefineConstants> 47 47 <ErrorReport>prompt</ErrorReport> … … 53 53 <DebugType>pdbonly</DebugType> 54 54 <Optimize>true</Optimize> 55 <OutputPath> $(SolutionDir)\bin\</OutputPath>55 <OutputPath>..\..\..\..\trunk\bin\</OutputPath> 56 56 <DefineConstants>TRACE</DefineConstants> 57 57 <ErrorReport>prompt</ErrorReport> … … 111 111 <Private>False</Private> 112 112 </Reference> 113 <Reference Include="AutoDiff-1.0"> 114 <HintPath>..\..\..\..\trunk\bin\AutoDiff-1.0.dll</HintPath> 115 <Private>False</Private> 116 </Reference> 113 117 <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> 114 118 <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath> … … 116 120 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 117 121 <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath> 118 </Reference>119 <Reference Include="LibSVM-3.12, Version=3.12.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">120 <HintPath>..\..\bin\LibSVM-3.12.dll</HintPath>121 122 <Private>False</Private> 122 123 </Reference> 124 <Reference Include="HeuristicLab.Algorithms.GradientDescent-3.3"> 125 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Algorithms.GradientDescent-3.3.dll</HintPath> 126 </Reference> 127 <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3"> 128 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll</HintPath> 129 </Reference> 130 <Reference Include="HeuristicLab.Analysis-3.3"> 131 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath> 132 </Reference> 133 <Reference Include="HeuristicLab.Collections-3.3"> 134 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath> 135 </Reference> 136 <Reference Include="HeuristicLab.Common-3.3"> 137 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath> 138 </Reference> 139 <Reference Include="HeuristicLab.Common.Resources-3.3"> 140 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath> 141 </Reference> 142 <Reference Include="HeuristicLab.Core-3.3"> 143 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath> 144 </Reference> 145 <Reference Include="HeuristicLab.Data-3.3"> 146 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath> 147 </Reference> 148 <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3"> 149 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath> 150 </Reference> 151 <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 152 <SpecificVersion>False</SpecificVersion> 153 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll</HintPath> 154 <Private>False</Private> 155 </Reference> 156 <Reference Include="HeuristicLab.Optimization-3.3"> 157 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath> 158 </Reference> 159 <Reference Include="HeuristicLab.Parameters-3.3"> 160 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll</HintPath> 161 </Reference> 162 <Reference Include="HeuristicLab.Persistence-3.3"> 163 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll</HintPath> 164 </Reference> 165 <Reference Include="HeuristicLab.PluginInfrastructure-3.3"> 166 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 167 </Reference> 168 <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4"> 169 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath> 170 </Reference> 171 <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4"> 172 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll</HintPath> 173 </Reference> 174 <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4"> 175 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath> 176 </Reference> 177 <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4"> 178 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.dll</HintPath> 179 </Reference> 180 <Reference Include="HeuristicLab.Problems.Instances-3.3"> 181 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath> 182 </Reference> 183 <Reference Include="HeuristicLab.Random-3.3"> 184 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Random-3.3.dll</HintPath> 185 </Reference> 186 <Reference Include="HeuristicLab.Selection-3.3"> 187 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Selection-3.3.dll</HintPath> 188 </Reference> 189 <Reference Include="LibSVM-3.12"> 190 <HintPath>..\..\..\..\trunk\bin\LibSVM-3.12.dll</HintPath> 191 </Reference> 123 192 <Reference Include="System" /> 124 <Reference Include="System.Core">125 <RequiredTargetFramework>3.5</RequiredTargetFramework>126 </Reference>127 193 <Reference Include="System.Drawing" /> 128 <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">129 <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>130 </Reference>131 194 </ItemGroup> 132 195 <ItemGroup> … … 341 404 </ItemGroup> 342 405 <ItemGroup> 343 <ProjectReference Include="..\..\HeuristicLab.Algorithms.GradientDescent\3.3\HeuristicLab.Algorithms.GradientDescent-3.3.csproj">344 <Project>{1256B945-EEA9-4BE4-9880-76B5B113F089}</Project>345 <Name>HeuristicLab.Algorithms.GradientDescent-3.3</Name>346 <Private>False</Private>347 </ProjectReference>348 <ProjectReference Include="..\..\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm\3.3\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj">349 <Project>{F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}</Project>350 <Name>HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3</Name>351 </ProjectReference>352 <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">353 <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>354 <Name>HeuristicLab.Analysis-3.3</Name>355 <Private>False</Private>356 </ProjectReference>357 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">358 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>359 <Name>HeuristicLab.Collections-3.3</Name>360 <Private>False</Private>361 </ProjectReference>362 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">363 <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>364 <Name>HeuristicLab.Common.Resources-3.3</Name>365 <Private>False</Private>366 </ProjectReference>367 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">368 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>369 <Name>HeuristicLab.Common-3.3</Name>370 <Private>False</Private>371 </ProjectReference>372 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">373 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>374 <Name>HeuristicLab.Core-3.3</Name>375 <Private>False</Private>376 </ProjectReference>377 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">378 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>379 <Name>HeuristicLab.Data-3.3</Name>380 <Private>False</Private>381 </ProjectReference>382 <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">383 <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>384 <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>385 <Private>False</Private>386 </ProjectReference>387 <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">388 <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>389 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>390 <Private>False</Private>391 </ProjectReference>392 <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">393 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>394 <Name>HeuristicLab.Operators-3.3</Name>395 <Private>False</Private>396 </ProjectReference>397 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">398 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>399 <Name>HeuristicLab.Optimization-3.3</Name>400 <Private>False</Private>401 </ProjectReference>402 <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">403 <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>404 <Name>HeuristicLab.Parameters-3.3</Name>405 <Private>False</Private>406 </ProjectReference>407 <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">408 <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>409 <Name>HeuristicLab.Persistence-3.3</Name>410 <Private>False</Private>411 </ProjectReference>412 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">413 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>414 <Name>HeuristicLab.PluginInfrastructure-3.3</Name>415 <Private>False</Private>416 </ProjectReference>417 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj">418 <Project>{05BAE4E1-A9FA-4644-AA77-42558720159E}</Project>419 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name>420 <Private>False</Private>421 </ProjectReference>422 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">423 <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>424 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>425 <Private>False</Private>426 </ProjectReference>427 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.csproj">428 <Project>{07486E68-1517-4B9D-A58D-A38E99AE71AB}</Project>429 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4</Name>430 </ProjectReference>431 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">432 <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>433 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>434 <Private>False</Private>435 </ProjectReference>436 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">437 <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>438 <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>439 <Private>False</Private>440 </ProjectReference>441 <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">442 <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>443 <Name>HeuristicLab.Problems.Instances-3.3</Name>444 <Private>False</Private>445 </ProjectReference>446 <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">447 <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>448 <Name>HeuristicLab.Random-3.3</Name>449 <Private>False</Private>450 </ProjectReference>451 <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">452 <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>453 <Name>HeuristicLab.Selection-3.3</Name>454 </ProjectReference>455 </ItemGroup>456 <ItemGroup>457 406 <None Include="HeuristicLab.snk" /> 458 407 <None Include="packages.config" /> … … 476 425 <Install>true</Install> 477 426 </BootstrapperPackage> 427 </ItemGroup> 428 <ItemGroup> 429 <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj"> 430 <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project> 431 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name> 432 </ProjectReference> 433 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj"> 434 <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project> 435 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name> 436 </ProjectReference> 478 437 </ItemGroup> 479 438 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> -
branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.DataAnalysis/3.4/Plugin.cs.frame
r16565 r16722 42 42 [PluginDependency("HeuristicLab.Optimization", "3.3")] 43 43 [PluginDependency("HeuristicLab.Parameters", "3.3")] 44 [PluginDependency("HeuristicLab. Persistence", "3.3")]44 [PluginDependency("HeuristicLab.Attic", "1.0")] 45 45 [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")] 46 46 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
Note: See TracChangeset
for help on using the changeset viewer.