Changeset 6900
- Timestamp:
- 10/11/11 12:12:02 (13 years ago)
- Location:
- branches/GeneralizedQAP
- Files:
-
- 20 edited
- 8 copied
-
. (modified) (2 props)
-
HeuristicLab 3.3.sln (modified) (2 diffs)
-
HeuristicLab.Analysis (modified) (1 prop)
-
HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) (1 prop)
-
HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (1 prop)
-
HeuristicLab.Encodings.PermutationEncoding (modified) (1 prop)
-
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/FullTreeCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/FullTreeCreator.cs)
-
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/GrowTreeCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/GrowTreeCreator.cs)
-
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/RampedHalfAndHalfTreeCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/RampedHalfAndHalfTreeCreator.cs)
-
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (1 diff)
-
HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
-
HeuristicLab.Persistence (modified) (1 prop)
-
HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
-
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
-
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionFullTreeCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionFullTreeCreator.cs)
-
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionGrowTreeCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionGrowTreeCreator.cs)
-
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionRampedHalfAndHalfTreeCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionRampedHalfAndHalfTreeCreator.cs)
-
HeuristicLab.Problems.QuadraticAssignment/3.3/app.config (modified) (1 diff)
-
HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
-
HeuristicLab.Problems.VehicleRouting.Views (modified) (1 prop)
-
HeuristicLab.Random/3.3/MersenneTwister.cs (modified) (7 diffs)
-
HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/FullTreeCreatorTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/FullTreeCreatorTest.cs)
-
HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/GrowTreeCreatorTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/GrowTreeCreatorTest.cs)
-
HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis-3.4/StatisticCalculatorsTest.cs (modified) (4 diffs)
-
HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (2 diffs)
-
HeuristicLab/3.3/CustomPostBuildTemplate_UpdateLocalInstallation.cmd (modified) (1 diff)
-
HeuristicLab/3.3/Files.txt (modified) (1 diff)
-
HeuristicLab/3.3/MergeConfigs.cmd (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/GeneralizedQAP
- Property svn:ignore
-
old new 17 17 protoc.exe 18 18 HeuristicLab.ExtLibs.6.0.ReSharper.user 19 Doxygen
-
- Property svn:mergeinfo changed
/trunk/sources merged: 6879-6880,6882,6884,6887-6888,6891,6895
- Property svn:ignore
-
branches/GeneralizedQAP/HeuristicLab 3.3.sln
r6878 r6900 4 4 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}" 5 5 ProjectSection(SolutionItems) = preProject 6 Build.cmd = Build.cmd 6 7 ConfigMerger.exe = ConfigMerger.exe 7 8 ..\documentation\License\gpl-3.0.txt = ..\documentation\License\gpl-3.0.txt … … 1456 1457 {B62872C1-6752-4758-9823-751A2D28C388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1457 1458 {B62872C1-6752-4758-9823-751A2D28C388}.Debug|Any CPU.Build.0 = Debug|Any CPU 1458 {B62872C1-6752-4758-9823-751A2D28C388}.Debug|x64.ActiveCfg = Debug|Any CPU 1459 {B62872C1-6752-4758-9823-751A2D28C388}.Debug|x86.ActiveCfg = Debug|Any CPU 1459 {B62872C1-6752-4758-9823-751A2D28C388}.Debug|x64.ActiveCfg = Debug|x64 1460 {B62872C1-6752-4758-9823-751A2D28C388}.Debug|x64.Build.0 = Debug|x64 1461 {B62872C1-6752-4758-9823-751A2D28C388}.Debug|x86.ActiveCfg = Debug|x86 1462 {B62872C1-6752-4758-9823-751A2D28C388}.Debug|x86.Build.0 = Debug|x86 1460 1463 {B62872C1-6752-4758-9823-751A2D28C388}.Release|Any CPU.ActiveCfg = Release|Any CPU 1461 1464 {B62872C1-6752-4758-9823-751A2D28C388}.Release|Any CPU.Build.0 = Release|Any CPU 1462 {B62872C1-6752-4758-9823-751A2D28C388}.Release|x64.ActiveCfg = Release|Any CPU 1463 {B62872C1-6752-4758-9823-751A2D28C388}.Release|x86.ActiveCfg = Release|Any CPU 1465 {B62872C1-6752-4758-9823-751A2D28C388}.Release|x64.ActiveCfg = Release|x64 1466 {B62872C1-6752-4758-9823-751A2D28C388}.Release|x64.Build.0 = Release|x64 1467 {B62872C1-6752-4758-9823-751A2D28C388}.Release|x86.ActiveCfg = Release|x86 1468 {B62872C1-6752-4758-9823-751A2D28C388}.Release|x86.Build.0 = Release|x86 1464 1469 EndGlobalSection 1465 1470 GlobalSection(SolutionProperties) = preSolution -
branches/GeneralizedQAP/HeuristicLab.Analysis
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/GeneralizedQAP/HeuristicLab.Analysis.Views/3.3/HeatMapView.resx
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (added) merged: 6866
- Property svn:mergeinfo changed
-
branches/GeneralizedQAP/HeuristicLab.Core.Views/3.3/TypeSelector.cs
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/GeneralizedQAP/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/GeneralizedQAP/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj
r6878 r6900 123 123 <Compile Include="Compiler\Instruction.cs" /> 124 124 <Compile Include="Compiler\SymbolicExpressionTreeCompiler.cs" /> 125 <Compile Include="Creators\FullTreeCreator.cs"> 126 <SubType>Code</SubType> 127 </Compile> 128 <Compile Include="Creators\GrowTreeCreator.cs"> 129 <SubType>Code</SubType> 130 </Compile> 131 <Compile Include="Creators\RampedHalfAndHalfTreeCreator.cs" /> 125 132 <Compile Include="Interfaces\IReadOnlySymbol.cs" /> 126 133 <Compile Include="Interfaces\ISymbolicExpressionGrammar.cs" /> -
branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/GeneralizedQAP/HeuristicLab.Persistence
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj
r6878 r6900 121 121 <Compile Include="Analyzers\SymbolicDataAnalysisVariableFrequencyAnalyzer.cs" /> 122 122 <Compile Include="Analyzers\SymbolicDataAnalysisAlleleFrequencyAnalyzer.cs" /> 123 <Compile Include="SymbolicDataAnalysisExpressionFullTreeCreator.cs" /> 123 124 <Compile Include="Plugin.cs" /> 125 <Compile Include="SymbolicDataAnalysisExpressionGrowTreeCreator.cs" /> 126 <Compile Include="SymbolicDataAnalysisExpressionRampedHalfAndHalfTreeCreator.cs" /> 124 127 <Compile Include="SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs" /> 125 128 <Compile Include="Formatters\SymbolicDataAnalysisExpressionLatexFormatter.cs" /> -
branches/GeneralizedQAP/HeuristicLab.Problems.QuadraticAssignment/3.3/app.config
r6875 r6900 31 31 binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IQAP" 32 32 behaviorConfiguration="ProblemInstancesLargeMessages" 33 contract="QAP ServiceReference.IQAP" name="BasicHttpBinding_IQAP" />33 contract="QAPInstanceService.IQAP" name="BasicHttpBinding_IQAP" /> 34 34 </client> 35 35 </system.serviceModel> -
branches/GeneralizedQAP/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/GeneralizedQAP/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/GeneralizedQAP/HeuristicLab.Random/3.3/MersenneTwister.cs
r5445 r6900 75 75 /// </summary> 76 76 public MersenneTwister() { 77 if (!init) seed((uint)DateTime.Now.Ticks);77 if (!init) Seed((uint)DateTime.Now.Ticks); 78 78 init = true; 79 79 } … … 84 84 /// <param name="s">The seed with which to initialize the random number generator.</param> 85 85 public MersenneTwister(uint s) { 86 seed(s);86 Seed(s); 87 87 init = true; 88 88 } … … 92 92 /// <param name="array">The seed array with which to initialize the random number generator.</param> 93 93 public MersenneTwister(uint[] array) { 94 seed(array);94 Seed(array); 95 95 init = true; 96 96 } … … 110 110 public void Reset() { 111 111 lock (locker) 112 seed((uint)DateTime.Now.Ticks);112 Seed((uint)DateTime.Now.Ticks); 113 113 } 114 114 /// <summary> … … 118 118 public void Reset(int s) { 119 119 lock (locker) 120 seed((uint)s);120 Seed((uint)s); 121 121 } 122 122 … … 176 176 /// </summary> 177 177 /// <param name="s">A starting seed.</param> 178 public void seed(uint s) {178 public void Seed(uint s) { 179 179 state[0] = s & 0xFFFFFFFFU; 180 180 for (int i = 1; i < n; ++i) { … … 188 188 /// </summary> 189 189 /// <param name="array">A starting seed array.</param> 190 public void seed(uint[] array) {191 seed(19650218U);190 public void Seed(uint[] array) { 191 Seed(19650218U); 192 192 int i = 1, j = 0; 193 193 for (int k = ((n > array.Length) ? n : array.Length); k > 0; --k) { -
branches/GeneralizedQAP/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis-3.4/StatisticCalculatorsTest.cs
r6878 r6900 22 22 using System.Collections.Generic; 23 23 using System.Linq; 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Problems.DataAnalysis; 25 26 using Microsoft.VisualStudio.TestTools.UnitTesting; … … 60 61 { 61 62 for (int col = 0; col < cols; col++) { 62 double scale = random.NextDouble() * 1E7;63 double scale = random.NextDouble(); 63 64 IEnumerable<double> x = from rows in Enumerable.Range(0, n) 64 65 select testData[rows, col] * scale; … … 77 78 double variance = calculator.Variance; 78 79 79 Assert. AreEqual(mean_alglib.ToString(), mean.ToString());80 Assert. AreEqual(variance_alglib.ToString(), variance.ToString());80 Assert.IsTrue(mean_alglib.IsAlmost(mean)); 81 Assert.IsTrue(variance_alglib.IsAlmost(variance)); 81 82 } 82 83 } … … 108 109 double r2 = r2Calculator.RSquared; 109 110 110 Assert. AreEqual(r2_alglib.ToString(), r2.ToString());111 Assert.IsTrue(r2_alglib.IsAlmost(r2)); 111 112 } 112 113 } -
branches/GeneralizedQAP/HeuristicLab.Tests/HeuristicLab.Tests.csproj
r6889 r6900 38 38 <PropertyGroup> 39 39 <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile> 40 </PropertyGroup> 41 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> 42 <DebugSymbols>true</DebugSymbols> 43 <OutputPath>bin\x64\Debug\</OutputPath> 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 <DebugType>full</DebugType> 46 <PlatformTarget>x64</PlatformTarget> 47 <CodeAnalysisLogFile>bin\Debug\HeuristicLab.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 48 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 49 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> 50 <ErrorReport>prompt</ErrorReport> 51 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 52 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories> 53 <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets> 54 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 55 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 56 </PropertyGroup> 57 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> 58 <OutputPath>bin\x64\Release\</OutputPath> 59 <DefineConstants>TRACE</DefineConstants> 60 <Optimize>true</Optimize> 61 <DebugType>pdbonly</DebugType> 62 <PlatformTarget>x64</PlatformTarget> 63 <CodeAnalysisLogFile>bin\Release\HeuristicLab.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 64 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 65 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> 66 <ErrorReport>prompt</ErrorReport> 67 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 68 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories> 69 <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets> 70 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 71 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 72 </PropertyGroup> 73 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> 74 <DebugSymbols>true</DebugSymbols> 75 <OutputPath>bin\x86\Debug\</OutputPath> 76 <DefineConstants>DEBUG;TRACE</DefineConstants> 77 <DebugType>full</DebugType> 78 <PlatformTarget>x86</PlatformTarget> 79 <CodeAnalysisLogFile>bin\Debug\HeuristicLab.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 80 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 81 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> 82 <ErrorReport>prompt</ErrorReport> 83 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 84 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories> 85 <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets> 86 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 87 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 88 </PropertyGroup> 89 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> 90 <OutputPath>bin\x86\Release\</OutputPath> 91 <DefineConstants>TRACE</DefineConstants> 92 <Optimize>true</Optimize> 93 <DebugType>pdbonly</DebugType> 94 <PlatformTarget>x86</PlatformTarget> 95 <CodeAnalysisLogFile>bin\Release\HeuristicLab.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 96 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 97 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> 98 <ErrorReport>prompt</ErrorReport> 99 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 100 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories> 101 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 40 102 </PropertyGroup> 41 103 <ItemGroup> … … 171 233 <Compile Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4\ArgumentDuplicaterTest.cs" /> 172 234 <Compile Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4\ChangeNodeTypeManipulationTest.cs" /> 235 <Compile Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4\FullTreeCreatorTest.cs" /> 173 236 <Compile Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4\Grammars.cs" /> 237 <Compile Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4\GrowTreeCreatorTest.cs" /> 174 238 <Compile Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4\ProbabilisticTreeCreaterTest.cs" /> 175 239 <Compile Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4\ReplaceBranchManipulationTest.cs" /> -
branches/GeneralizedQAP/HeuristicLab/3.3/CustomPostBuildTemplate_UpdateLocalInstallation.cmd
r6878 r6900 1 1 set target=C:\Program Files\HeuristicLab 3.3 2 2 3 copy "HeuristicLab 3.3.exe" "%target%" 4 copy "HeuristicLab 3.3.exe.config" "%target%" 5 copy HeuristicLab.PluginInfrastructure-3.3.dll "%target%" 6 7 FOR /F "skip=1 tokens=1-2 delims=: usebackq" %%G IN ("%ProjectDir%\Files.txt") DO copy "%Outdir%\%%H" "%target%" >nul 8 3 FOR /F "skip=1 tokens=1 delims= usebackq" %%G IN ("%ProjectDir%\Files.txt") DO copy "%Outdir%\%%G" "%target%" >nul 9 4 10 5 echo "Platform: %Platform%, architecture: %PROCESSOR_ARCHITECTURE%" -
branches/GeneralizedQAP/HeuristicLab/3.3/Files.txt
r6878 r6900 1 1 ; This line is skipped. DO NOT TOUCH THIS line! 2 ; List of project directories and file names separated by ':' that are part of the installation2 ; List of files that are to be copied to the installation directory 3 3 4 HeuristicLab.PluginInfrastructure\3.3:ICSharpCode.SharpZipLib.dll 5 HeuristicLab.PluginInfrastructure\3.3:ICSharpCode.SharpZipLib License.txt 6 HeuristicLab.Algorithms.DataAnalysis\3.3:HeuristicLab.Algorithms.DataAnalysis-3.3.dll 7 HeuristicLab.Algorithms.DataAnalysis\3.4:HeuristicLab.Algorithms.DataAnalysis-3.4.dll 8 HeuristicLab.Algorithms.DataAnalysis.Views\3.3:HeuristicLab.Algorithms.DataAnalysis.Views-3.3.dll 9 HeuristicLab.Algorithms.DataAnalysis.Views\3.4:HeuristicLab.Algorithms.DataAnalysis.Views-3.4.dll 10 HeuristicLab.Algorithms.EvolutionStrategy\3.3:HeuristicLab.Algorithms.EvolutionStrategy-3.3.dll 11 HeuristicLab.Algorithms.GeneticAlgorithm\3.3:HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll 12 HeuristicLab.Algorithms.LocalSearch\3.3:HeuristicLab.Algorithms.LocalSearch-3.3.dll 13 HeuristicLab.Algorithms.NSGA2\3.3:HeuristicLab.Algorithms.NSGA2-3.3.dll 14 HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm\3.3:HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll 15 HeuristicLab.Algorithms.ParticleSwarmOptimization\3.3:HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll 16 HeuristicLab.Algorithms.SimulatedAnnealing\3.3:HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll 17 HeuristicLab.Algorithms.TabuSearch\3.3:HeuristicLab.Algorithms.TabuSearch-3.3.dll 18 HeuristicLab.Algorithms.VariableNeighborhoodSearch\3.3:HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.dll 19 HeuristicLab.Analysis\3.3:HeuristicLab.Analysis-3.3.dll 20 HeuristicLab.Analysis.Views\3.3:HeuristicLab.Analysis.Views-3.3.dll 21 HeuristicLab.Clients.Common\3.3:HeuristicLab.Clients.Common-3.3.dll 22 HeuristicLab.CodeEditor\3.3:HeuristicLab.CodeEditor-3.3.dll 23 HeuristicLab.Collections\3.3:HeuristicLab.Collections-3.3.dll 24 HeuristicLab.Common\3.3:HeuristicLab.Common-3.3.dll 25 HeuristicLab.Common.Resources\3.3:HeuristicLab.Common.Resources-3.3.dll 26 HeuristicLab.Core\3.3:HeuristicLab.Core-3.3.dll 27 HeuristicLab.Core.Views\3.3:HeuristicLab.Core.Views-3.3.dll 28 HeuristicLab.Data\3.3:HeuristicLab.Data-3.3.dll 29 HeuristicLab.Data.Views\3.3:HeuristicLab.Data.Views-3.3.dll 30 HeuristicLab.DebugEngine\3.3:HeuristicLab.DebugEngine-3.3.dll 31 HeuristicLab.Encodings.BinaryVectorEncoding\3.3:HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll 32 HeuristicLab.Encodings.IntegerVectorEncoding\3.3:HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll 33 HeuristicLab.Encodings.PermutationEncoding\3.3:HeuristicLab.Encodings.PermutationEncoding-3.3.dll 34 HeuristicLab.Encodings.PermutationEncoding.Views\3.3:HeuristicLab.Encodings.PermutationEncoding.Views-3.3.dll 35 HeuristicLab.Encodings.RealVectorEncoding\3.3:HeuristicLab.Encodings.RealVectorEncoding-3.3.dll 36 HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3:HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.dll 37 HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4:HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll 38 HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3:HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.dll 39 HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4:HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.dll 40 HeuristicLab.MainForm\3.3:HeuristicLab.MainForm-3.3.dll 41 HeuristicLab.MainForm.WindowsForms\3.3:HeuristicLab.MainForm.WindowsForms-3.3.dll 42 HeuristicLab.Operators\3.3:HeuristicLab.Operators-3.3.dll 43 HeuristicLab.Operators.Views\3.3:HeuristicLab.Operators.Views-3.3.dll 44 HeuristicLab.Operators.Views.GraphVisualization\3.3:HeuristicLab.Operators.Views.GraphVisualization-3.3.dll 45 HeuristicLab.Operators.Views.GraphVisualization.Views\3.3:HeuristicLab.Operators.Views.GraphVisualization.Views-3.3.dll 46 HeuristicLab.Operators.Programmable\3.3:HeuristicLab.Operators.Programmable-3.3.dll 47 HeuristicLab.Optimization\3.3:HeuristicLab.Optimization-3.3.dll 48 HeuristicLab.Optimization.Operators\3.3:HeuristicLab.Optimization.Operators-3.3.dll 49 HeuristicLab.Optimization.Views\3.3:HeuristicLab.Optimization.Views-3.3.dll 50 HeuristicLab.Optimizer\3.3:HeuristicLab.Optimizer-3.3.dll 51 HeuristicLab.ParallelEngine\3.3:HeuristicLab.ParallelEngine-3.3.dll 52 HeuristicLab.Parameters\3.3:HeuristicLab.Parameters-3.3.dll 53 HeuristicLab.Parameters.Views\3.3:HeuristicLab.Parameters.Views-3.3.dll 54 HeuristicLab.Persistence\3.3:HeuristicLab.Persistence-3.3.dll 55 HeuristicLab.Persistence.GUI\3.3:HeuristicLab.Persistence.GUI-3.3.dll 56 HeuristicLab.Problems.ArtificialAnt\3.3:HeuristicLab.Problems.ArtificialAnt-3.3.dll 57 HeuristicLab.Problems.ArtificialAnt\3.4:HeuristicLab.Problems.ArtificialAnt-3.4.dll 58 HeuristicLab.Problems.ArtificialAnt.Views\3.3:HeuristicLab.Problems.ArtificialAnt.Views-3.3.dll 59 HeuristicLab.Problems.ArtificialAnt.Views\3.4:HeuristicLab.Problems.ArtificialAnt.Views-3.4.dll 60 HeuristicLab.Problems.DataAnalysis\3.3:HeuristicLab.Problems.DataAnalysis-3.3.dll 61 HeuristicLab.Problems.DataAnalysis\3.4:HeuristicLab.Problems.DataAnalysis-3.4.dll 62 HeuristicLab.Problems.DataAnalysis.Classification\3.3:HeuristicLab.Problems.DataAnalysis.Classification-3.3.dll 63 HeuristicLab.Problems.DataAnalysis.Classification.Views\3.3:HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll 64 HeuristicLab.Problems.DataAnalysis.Regression\3.3:HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll 65 HeuristicLab.Problems.DataAnalysis.Symbolic\3.4:HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll 66 HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4:HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll 67 HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4:HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll 68 HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views\3.4:HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.dll 69 HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4:HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll 70 HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views\3.4:HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.dll 71 HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis\3.4:HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.dll 72 HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views\3.4:HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views-3.4.dll 73 HeuristicLab.Problems.DataAnalysis.Views\3.3:HeuristicLab.Problems.DataAnalysis.Views-3.3.dll 74 HeuristicLab.Problems.DataAnalysis.Views\3.4:HeuristicLab.Problems.DataAnalysis.Views-3.4.dll 75 HeuristicLab.Problems.ExternalEvaluation\3.3:HeuristicLab.Problems.ExternalEvaluation-3.3.dll 76 HeuristicLab.Problems.ExternalEvaluation.Views\3.3:HeuristicLab.Problems.ExternalEvaluation.Views-3.3.dll 77 HeuristicLab.Problems.ExternalEvaluation.GP\3.3:HeuristicLab.Problems.ExternalEvaluation.GP-3.3.dll 78 HeuristicLab.Problems.ExternalEvaluation.GP\3.4:HeuristicLab.Problems.ExternalEvaluation.GP-3.4.dll 79 HeuristicLab.Problems.ExternalEvaluation.GP.Views\3.3:HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll 80 HeuristicLab.Problems.GeneralizedQuadraticAssignment\3.3:HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.dll 81 HeuristicLab.Problems.Knapsack\3.3:HeuristicLab.Problems.Knapsack-3.3.dll 82 HeuristicLab.Problems.Knapsack.Views\3.3:HeuristicLab.Problems.Knapsack.Views-3.3.dll 83 HeuristicLab.Problems.OneMax\3.3:HeuristicLab.Problems.OneMax-3.3.dll 84 HeuristicLab.Problems.OneMax.Views\3.3:HeuristicLab.Problems.OneMax.Views-3.3.dll 85 HeuristicLab.Problems.QuadraticAssignment\3.3:HeuristicLab.Problems.QuadraticAssignment-3.3.dll 86 HeuristicLab.Problems.QuadraticAssignment.Algorithms\3.3:HeuristicLab.Problems.QuadraticAssignment.Algorithms-3.3.dll 87 HeuristicLab.Problems.QuadraticAssignment.Views\3.3:HeuristicLab.Problems.QuadraticAssignment.Views-3.3.dll 88 HeuristicLab.Problems.TestFunctions\3.3:HeuristicLab.Problems.TestFunctions-3.3.dll 89 HeuristicLab.Problems.TestFunctions.Views\3.3:HeuristicLab.Problems.TestFunctions.Views-3.3.dll 90 HeuristicLab.Problems.TravelingSalesman\3.3:HeuristicLab.Problems.TravelingSalesman-3.3.dll 91 HeuristicLab.Problems.TravelingSalesman.Views\3.3:HeuristicLab.Problems.TravelingSalesman.Views-3.3.dll 92 HeuristicLab.Problems.VehicleRouting\3.3:HeuristicLab.Problems.VehicleRouting-3.3.dll 93 HeuristicLab.Problems.VehicleRouting.Views\3.3:HeuristicLab.Problems.VehicleRouting.Views-3.3.dll 94 HeuristicLab.Random\3.3:HeuristicLab.Random-3.3.dll 95 HeuristicLab.Selection\3.3:HeuristicLab.Selection-3.3.dll 96 HeuristicLab.SequentialEngine\3.3:HeuristicLab.SequentialEngine-3.3.dll 97 HeuristicLab.Tracing\3.3:HeuristicLab.Tracing-3.3.dll 98 HeuristicLab.Tracing\3.3:HeuristicLab.log4net.xml 99 HeuristicLab.Visualization.ChartControlsExtensions\3.3:HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll 100 101 ;External Libraries 102 HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0:ALGLIB-3.1.0.dll 103 HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0:HeuristicLab.ALGLIB-3.1.0.dll 104 HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0:ALGLIB License-3.1.0.txt 105 HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3:HeuristicLab.LibSVM-1.6.3.dll 106 HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3:LibSVM-1.6.3.dll 107 HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3:SVM.NET-1.6.3 License.txt 108 109 HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0:HeuristicLab.log4net-1.2.10.0.dll 110 HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0:log4net.dll 111 HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0:log4net License.txt 112 113 HeuristicLab.ExtLibs\HeuristicLab.Netron\3.0.2672.12446\Netron.Diagramming.Core-3.0.2672.12446:Netron.Diagramming.Core-3.0.2672.12446.dll 114 HeuristicLab.ExtLibs\HeuristicLab.Netron\3.0.2672.12446\HeuristicLab.Netron-3.0.2672.12446:HeuristicLab.Netron-3.0.2672.12446.dll 115 HeuristicLab.ExtLibs\HeuristicLab.Netron\3.0.2672.12446\HeuristicLab.Netron-3.0.2672.12446:Netron.Diagramming.Core License.txt 116 117 HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS:HeuristicLab.ProtobufCS-0.9.1.dll 118 HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS:Google.ProtocolBuffers-0.9.1.dll 119 HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS:Google.ProtocolBuffers-license-0.9.1.txt 120 121 HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327:HeuristicLab.SharpDevelop-3.1.1.5327.dll 122 HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327:ICSharpCode.NRefactory.dll 123 HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327:ICSharpCode.SharpDevelop.Dom.dll 124 HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327:ICSharpCode.TextEditor.dll 125 HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327:Mono.Cecil.dll 126 HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327:Mono Cecil License.txt 127 HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327:SharpDevelop License.txt 128 129 HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1:WeifenLuo.WinFormsUI.Docking-2.3.1.dll 130 HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\HeuristicLab.WinFormsUI-2.3.1:HeuristicLab.WinFormsUI-2.3.1.dll 131 HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\HeuristicLab.WinFormsUI-2.3.1:WeifenLuo.WinFormsUI.Docking License.txt 132 133 HeuristicLab.ExtLibs\HeuristicLab.DayView\1.0:HeuristicLab.DayView-1.0.dll 134 HeuristicLab.ExtLibs\HeuristicLab.DayView\1.0:Calendar.DayView.dll 135 HeuristicLab.ExtLibs\HeuristicLab.DayView\1.0:DayView License.txt 4 HeuristicLab 3.3.exe 5 HeuristicLab 3.3.exe.config 6 *.dll 7 *.txt -
branches/GeneralizedQAP/HeuristicLab/3.3/MergeConfigs.cmd
r6878 r6900 1 ConfigMerger "%Outdir%HeuristicLab.PluginInfrastructure-3.3.dll.config" "HeuristicLab 3.3.exe.config" 2 ConfigMerger "%Outdir%HeuristicLab.Clients.Common-3.3.dll.config" "HeuristicLab 3.3.exe.config" 3 ConfigMerger "%Outdir%HeuristicLab.Optimizer-3.3.dll.config" "HeuristicLab 3.3.exe.config" 4 ConfigMerger "%Outdir%HeuristicLab.Persistence-3.3.dll.config" "HeuristicLab 3.3.exe.config" 5 ConfigMerger "%Outdir%HeuristicLab.Tracing-3.3.dll.config" "HeuristicLab 3.3.exe.config" 1 FOR /F "tokens=*" %%A IN ('dir /B "%Outdir%*.dll.config"') DO ( 2 ConfigMerger "%%A" "HeuristicLab 3.3.exe.config" 3 )
Note: See TracChangeset
for help on using the changeset viewer.
