- Timestamp:
- 09/17/13 11:18:43 (11 years ago)
- Location:
- trunk/sources
- Files:
-
- 26 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab 3.3.sln
r9809 r9980 132 132 {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} 133 133 {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5} = {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5} 134 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A} = {98EF72F8-D207-4A5B-8291-95DC73DDFD9A} 134 135 {E4EE5AFB-D552-447B-8A16-6CBE7938AF32} = {E4EE5AFB-D552-447B-8A16-6CBE7938AF32} 135 136 EndProjectSection … … 381 382 EndProject 382 383 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4", "HeuristicLab.Problems.DataAnalysis.Trading.Views\3.4\HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4.csproj", "{CB3D0A1E-1BE8-476B-A53C-2B189E30064F}" 384 EndProject 385 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.TestFunctions-3.3", "HeuristicLab.Problems.Instances.TestFunctions\3.3\HeuristicLab.Problems.Instances.TestFunctions-3.3.csproj", "{98EF72F8-D207-4A5B-8291-95DC73DDFD9A}" 383 386 EndProject 384 387 Global … … 1856 1859 {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.ActiveCfg = Release|x86 1857 1860 {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.Build.0 = Release|x86 1861 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1862 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.Build.0 = Debug|Any CPU 1863 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x64.ActiveCfg = Debug|x64 1864 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x64.Build.0 = Debug|x64 1865 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x86.ActiveCfg = Debug|x86 1866 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x86.Build.0 = Debug|x86 1867 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.ActiveCfg = Release|Any CPU 1868 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.Build.0 = Release|Any CPU 1869 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x64.ActiveCfg = Release|x64 1870 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x64.Build.0 = Release|x64 1871 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x86.ActiveCfg = Release|x86 1872 {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x86.Build.0 = Release|x86 1858 1873 EndGlobalSection 1859 1874 GlobalSection(SolutionProperties) = preSolution -
trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/HeuristicLab.Problems.Instances.TestFunctions-3.3.csproj
r9878 r9980 17 17 <DebugType>full</DebugType> 18 18 <Optimize>false</Optimize> 19 <OutputPath>..\..\ ..\..\trunk\sources\bin\</OutputPath>19 <OutputPath>..\..\bin\</OutputPath> 20 20 <DefineConstants>DEBUG;TRACE</DefineConstants> 21 21 <ErrorReport>prompt</ErrorReport> … … 25 25 <DebugType>pdbonly</DebugType> 26 26 <Optimize>true</Optimize> 27 <OutputPath>..\..\ ..\..\trunk\sources\bin\</OutputPath>27 <OutputPath>..\..\bin\</OutputPath> 28 28 <DefineConstants>TRACE</DefineConstants> 29 29 <ErrorReport>prompt</ErrorReport> … … 38 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> 39 39 <DebugSymbols>true</DebugSymbols> 40 <OutputPath>..\..\ ..\..\trunk\sources\bin\</OutputPath>40 <OutputPath>..\..\bin\</OutputPath> 41 41 <DefineConstants>DEBUG;TRACE</DefineConstants> 42 42 <DebugType>full</DebugType> 43 43 <PlatformTarget>x64</PlatformTarget> 44 <CodeAnalysisLogFile>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.TestFunctions-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>45 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>46 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>47 44 <ErrorReport>prompt</ErrorReport> 48 45 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 49 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>50 <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>51 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>52 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>53 46 </PropertyGroup> 54 47 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> 55 <OutputPath>..\..\ ..\..\trunk\sources\bin\</OutputPath>48 <OutputPath>..\..\bin\</OutputPath> 56 49 <DefineConstants>TRACE</DefineConstants> 57 50 <Optimize>true</Optimize> 58 51 <DebugType>pdbonly</DebugType> 59 52 <PlatformTarget>x64</PlatformTarget> 60 <CodeAnalysisLogFile>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.TestFunctions-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>61 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>62 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>63 53 <ErrorReport>prompt</ErrorReport> 64 54 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 65 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>66 <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>67 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>68 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>69 55 </PropertyGroup> 70 56 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> … … 74 60 <DebugType>full</DebugType> 75 61 <PlatformTarget>x86</PlatformTarget> 76 <CodeAnalysisLogFile>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.TestFunctions-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>77 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>78 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>79 62 <ErrorReport>prompt</ErrorReport> 80 63 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 81 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>82 <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>83 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>84 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>85 64 </PropertyGroup> 86 65 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> 87 <OutputPath>..\..\ ..\..\trunk\sources\bin\</OutputPath>66 <OutputPath>..\..\bin\</OutputPath> 88 67 <DefineConstants>TRACE</DefineConstants> 89 68 <Optimize>true</Optimize> 90 69 <DebugType>pdbonly</DebugType> 91 70 <PlatformTarget>x86</PlatformTarget> 92 <CodeAnalysisLogFile>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.TestFunctions-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>93 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>94 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>95 71 <ErrorReport>prompt</ErrorReport> 96 72 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 97 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>98 <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>99 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>100 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>101 73 </PropertyGroup> 102 74 <ItemGroup> 103 < Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">104 < SpecificVersion>False</SpecificVersion>105 < HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>75 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 76 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> 77 <Name>HeuristicLab.Common-3.3</Name> 106 78 <Private>False</Private> 107 </ Reference>108 < Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">109 < SpecificVersion>False</SpecificVersion>110 < HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>79 </ProjectReference> 80 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj"> 81 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project> 82 <Name>HeuristicLab.Core-3.3</Name> 111 83 <Private>False</Private> 112 </ Reference>113 < Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">114 < SpecificVersion>False</SpecificVersion>115 < HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>84 </ProjectReference> 85 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> 86 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> 87 <Name>HeuristicLab.Optimization-3.3</Name> 116 88 <Private>False</Private> 117 </ Reference>118 < Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">119 < SpecificVersion>False</SpecificVersion>120 < HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>89 </ProjectReference> 90 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj"> 91 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> 92 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 121 93 <Private>False</Private> 122 </Reference> 94 </ProjectReference> 95 <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj"> 96 <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project> 97 <Name>HeuristicLab.Problems.Instances-3.3</Name> 98 <Private>False</Private> 99 </ProjectReference> 100 <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj"> 101 <Project>{88b9b0e3-344e-4196-82a3-0f9732506fe8}</Project> 102 <Name>HeuristicLab.Problems.TestFunctions-3.3</Name> 103 <Private>False</Private> 104 </ProjectReference> 123 105 <Reference Include="System" /> 124 106 <Reference Include="System.Core" /> … … 136 118 <None Include="HeuristicLab.snk" /> 137 119 <None Include="Plugin.cs.frame" /> 138 </ItemGroup>139 <ItemGroup>140 <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">141 <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>142 <Name>HeuristicLab.Problems.Instances-3.3</Name>143 <Private>False</Private>144 </ProjectReference>145 <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj">146 <Project>{88b9b0e3-344e-4196-82a3-0f9732506fe8}</Project>147 <Name>HeuristicLab.Problems.TestFunctions-3.3</Name>148 <Private>False</Private>149 </ProjectReference>150 120 </ItemGroup> 151 121 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> … … 165 135 </Target> 166 136 --> 137 <PropertyGroup> 138 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 139 set ProjectDir=$(ProjectDir) 140 set SolutionDir=$(SolutionDir) 141 142 call "$(ProjectDir)\Protos\ProcessProtos.cmd" 143 call PreBuildEvent.cmd 144 </PreBuildEvent> 145 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 146 export ProjectDir=$(ProjectDir) 147 export SolutionDir=$(SolutionDir) 148 149 $SolutionDir/PreBuildEvent.sh 150 </PreBuildEvent> 151 </PropertyGroup> 167 152 </Project> -
trunk/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj
r8882 r9980 119 119 <Compile Include="IDataDescriptor.cs" /> 120 120 <Compile Include="Types\DistanceHelper.cs" /> 121 <Compile Include="Types\SOTFData.cs" /> 121 122 <Compile Include="Types\VRP\MDCVRPTWData.cs" /> 122 123 <Compile Include="Types\VRP\MDCVRPData.cs" /> … … 143 144 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> 144 145 <Name>HeuristicLab.Common-3.3</Name> 146 <Private>False</Private> 147 </ProjectReference> 148 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj"> 149 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project> 150 <Name>HeuristicLab.Core-3.3</Name> 145 151 <Private>False</Private> 146 152 </ProjectReference> -
trunk/sources/HeuristicLab.Problems.Instances/3.3/Plugin.cs.frame
r9462 r9980 26 26 [PluginFile("HeuristicLab.Problems.Instances-3.3.dll", PluginFileType.Assembly)] 27 27 [PluginDependency("HeuristicLab.Common", "3.3")] 28 [PluginDependency("HeuristicLab.Core", "3.3")] 28 29 public class HeuristicLabProblemsInstancesPlugin : PluginBase { 29 30 } -
trunk/sources/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame
r9462 r9980 28 28 // associated with an assembly. 29 29 [assembly: AssemblyTitle("HeuristicLab.Problems.Instances")] 30 [assembly: AssemblyDescription(" ")]30 [assembly: AssemblyDescription("Base plugin for making problem instances available to problems.")] 31 31 [assembly: AssemblyConfiguration("")] 32 32 [assembly: AssemblyCompany("HEAL")] -
trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj
r8600 r9980 113 113 </ItemGroup> 114 114 <ItemGroup> 115 <Compile Include="SingleObjectiveTestFunctionProblemView.cs"> 116 <SubType>UserControl</SubType> 117 </Compile> 118 <Compile Include="SingleObjectiveTestFunctionProblemView.Designer.cs"> 119 <DependentUpon>SingleObjectiveTestFunctionProblemView.cs</DependentUpon> 120 </Compile> 115 121 <Compile Include="SingleObjectiveTestFunctionSolutionView.cs"> 116 122 <SubType>UserControl</SubType> … … 177 183 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> 178 184 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 185 <Private>False</Private> 186 </ProjectReference> 187 <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj"> 188 <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project> 189 <Name>HeuristicLab.Problems.Instances-3.3</Name> 179 190 <Private>False</Private> 180 191 </ProjectReference> … … 211 222 --> 212 223 <PropertyGroup> 213 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)224 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 214 225 set ProjectDir=$(ProjectDir) 215 226 set SolutionDir=$(SolutionDir) … … 218 229 call PreBuildEvent.cmd 219 230 </PreBuildEvent> 220 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">231 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 221 232 export ProjectDir=$(ProjectDir) 222 233 export SolutionDir=$(SolutionDir) -
trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame
r9462 r9980 36 36 [PluginDependency("HeuristicLab.MainForm", "3.3")] 37 37 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 38 [PluginDependency("HeuristicLab.Optimization", "3.3")] 39 [PluginDependency("HeuristicLab.Optimization.Views", "3.3")] 38 40 [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")] 39 41 public class HeuristicLabProblemsTestFunctionsViewsPlugin : PluginBase { -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs
r9456 r9980 35 35 [StorableClass] 36 36 public class AckleyEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 37 public override string FunctionName { get { return "Ackley"; } } 37 38 /// <summary> 38 39 /// Returns false as the Ackley function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs
r9456 r9980 35 35 [StorableClass] 36 36 public class BealeEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 37 public override string FunctionName { get { return "Beale"; } } 37 38 /// <summary> 38 39 /// Returns false as the Beale function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs
r9456 r9980 34 34 [StorableClass] 35 35 public class BoothEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 36 public override string FunctionName { get { return "Booth"; } } 36 37 /// <summary> 37 38 /// Returns false as the Booth function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs
r9456 r9980 36 36 [StorableClass] 37 37 public class GriewankEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 38 public override string FunctionName { get { return "Griewank"; } } 38 39 /// <summary> 39 40 /// Returns false as the Griewank function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs
r9456 r9980 34 34 [StorableClass] 35 35 public class LevyEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 36 public override string FunctionName { get { return "Levy"; } } 36 37 /// <summary> 37 38 /// Returns false as the Levy function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs
r9456 r9980 34 34 [StorableClass] 35 35 public class MatyasEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 36 public override string FunctionName { get { return "Matyas"; } } 36 37 /// <summary> 37 38 /// Returns false as the Matyas function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs
r9456 r9980 35 35 [StorableClass] 36 36 public class MultinormalEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 37 public override string FunctionName { get { return "Multinormal"; } } 37 38 38 39 private ItemList<RealVector> centers { -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs
r9456 r9980 35 35 [StorableClass] 36 36 public class RandomEvaluator : SingleObjectiveTestFunctionProblemEvaluator, IStochasticOperator { 37 public override string FunctionName { get { return "Random"; } } 37 38 /// <summary> 38 39 /// It does not really matter. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs
r9456 r9980 36 36 [StorableClass] 37 37 public class RastriginEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 38 public override string FunctionName { get { return "Rastrigin"; } } 38 39 /// <summary> 39 40 /// Returns false as the Rastrigin function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs
r9456 r9980 38 38 [StorableClass] 39 39 public class RosenbrockEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 40 public override string FunctionName { get { return "Rosenbrock"; } } 40 41 /// <summary> 41 42 /// Returns false as the Rosenbrock function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs
r9456 r9980 34 34 [StorableClass] 35 35 public class SchwefelEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 36 public override string FunctionName { get { return "Schwefel"; } } 36 37 /// <summary> 37 38 /// Returns false as the Schwefel (sine root) function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs
r9456 r9980 35 35 [StorableClass] 36 36 public abstract class SingleObjectiveTestFunctionProblemEvaluator : SingleSuccessorOperator, ISingleObjectiveTestFunctionProblemEvaluator { 37 /// <summary> 38 /// The name of the function 39 /// </summary> 40 public abstract string FunctionName { get; } 37 41 /// <summary> 38 42 /// These operators should not change their name through the GUI -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs
r9456 r9980 36 36 [StorableClass] 37 37 public class SphereEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 38 public override string FunctionName { get { return "Sphere"; } } 38 39 /// <summary> 39 40 /// Returns false as the Sphere function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs
r9456 r9980 33 33 [StorableClass] 34 34 public class SumSquaresEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 35 public override string FunctionName { get { return "SumSquares"; } } 35 36 /// <summary> 36 37 /// Returns false as the Sum Squares function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs
r9456 r9980 33 33 [StorableClass] 34 34 public class ZakharovEvaluator : SingleObjectiveTestFunctionProblemEvaluator { 35 public override string FunctionName { get { return "Zakharov"; } } 35 36 /// <summary> 36 37 /// Returns false as the Zakharov function is a minimization problem. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj
r9300 r9980 41 41 <DebugType>full</DebugType> 42 42 <Optimize>false</Optimize> 43 <OutputPath> $(SolutionDir)\bin\</OutputPath>43 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <ErrorReport>prompt</ErrorReport> … … 50 50 <DebugType>pdbonly</DebugType> 51 51 <Optimize>true</Optimize> 52 <OutputPath> $(SolutionDir)\bin\</OutputPath>52 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 53 53 <DefineConstants>TRACE</DefineConstants> 54 54 <ErrorReport>prompt</ErrorReport> … … 58 58 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> 59 59 <DebugSymbols>true</DebugSymbols> 60 <OutputPath> $(SolutionDir)\bin\</OutputPath>60 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 61 61 <DefineConstants>DEBUG;TRACE</DefineConstants> 62 62 <DebugType>full</DebugType> … … 66 66 </PropertyGroup> 67 67 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> 68 <OutputPath> $(SolutionDir)\bin\</OutputPath>68 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 69 69 <DefineConstants>TRACE</DefineConstants> 70 70 <Optimize>true</Optimize> … … 76 76 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 77 77 <DebugSymbols>true</DebugSymbols> 78 <OutputPath> $(SolutionDir)\bin\</OutputPath>78 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 79 79 <DefineConstants>DEBUG;TRACE</DefineConstants> 80 80 <DebugType>full</DebugType> … … 84 84 </PropertyGroup> 85 85 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 86 <OutputPath> $(SolutionDir)\bin\</OutputPath>86 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 87 87 <DefineConstants>TRACE</DefineConstants> 88 88 <Optimize>true</Optimize> … … 93 93 </PropertyGroup> 94 94 <ItemGroup> 95 <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 96 <SpecificVersion>False</SpecificVersion> 97 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath> 98 <Private>False</Private> 99 </Reference> 100 <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 101 <SpecificVersion>False</SpecificVersion> 102 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath> 103 <Private>False</Private> 104 </Reference> 105 <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 106 <SpecificVersion>False</SpecificVersion> 107 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath> 108 <Private>False</Private> 109 </Reference> 110 <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 111 <SpecificVersion>False</SpecificVersion> 112 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath> 113 <Private>False</Private> 114 </Reference> 115 <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 116 <SpecificVersion>False</SpecificVersion> 117 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath> 118 <Private>False</Private> 119 </Reference> 120 <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 121 <SpecificVersion>False</SpecificVersion> 122 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath> 123 <Private>False</Private> 124 </Reference> 125 <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 126 <SpecificVersion>False</SpecificVersion> 127 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath> 128 <Private>False</Private> 129 </Reference> 130 <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 131 <SpecificVersion>False</SpecificVersion> 132 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath> 133 <Private>False</Private> 134 </Reference> 135 <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 136 <SpecificVersion>False</SpecificVersion> 137 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath> 138 <Private>False</Private> 139 </Reference> 140 <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 141 <SpecificVersion>False</SpecificVersion> 142 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath> 143 <Private>False</Private> 144 </Reference> 145 <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 146 <SpecificVersion>False</SpecificVersion> 147 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath> 148 <Private>False</Private> 149 </Reference> 150 <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 151 <SpecificVersion>False</SpecificVersion> 152 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath> 153 <Private>False</Private> 154 </Reference> 155 <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 156 <SpecificVersion>False</SpecificVersion> 157 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 158 <Private>False</Private> 159 </Reference> 95 160 <Reference Include="System" /> 96 161 <Reference Include="System.Core"> … … 164 229 </ItemGroup> 165 230 <ItemGroup> 166 <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">167 <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>168 <Name>HeuristicLab.Analysis-3.3</Name>169 </ProjectReference>170 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">171 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>172 <Name>HeuristicLab.Collections-3.3</Name>173 <Private>False</Private>174 </ProjectReference>175 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">176 <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>177 <Name>HeuristicLab.Common.Resources-3.3</Name>178 <Private>False</Private>179 </ProjectReference>180 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">181 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>182 <Name>HeuristicLab.Common-3.3</Name>183 <Private>False</Private>184 </ProjectReference>185 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">186 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>187 <Name>HeuristicLab.Core-3.3</Name>188 <Private>False</Private>189 </ProjectReference>190 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">191 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>192 <Name>HeuristicLab.Data-3.3</Name>193 <Private>False</Private>194 </ProjectReference>195 <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">196 <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>197 <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>198 <Private>False</Private>199 </ProjectReference>200 <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">201 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>202 <Name>HeuristicLab.Operators-3.3</Name>203 <Private>False</Private>204 </ProjectReference>205 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">206 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>207 <Name>HeuristicLab.Optimization.Operators-3.3</Name>208 </ProjectReference>209 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">210 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>211 <Name>HeuristicLab.Optimization-3.3</Name>212 <Private>False</Private>213 </ProjectReference>214 <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">215 <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>216 <Name>HeuristicLab.Parameters-3.3</Name>217 <Private>False</Private>218 </ProjectReference>219 <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">220 <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>221 <Name>HeuristicLab.Persistence-3.3</Name>222 <Private>False</Private>223 </ProjectReference>224 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">225 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>226 <Name>HeuristicLab.PluginInfrastructure-3.3</Name>227 <Private>False</Private>228 </ProjectReference>229 </ItemGroup>230 <ItemGroup>231 231 <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> 232 232 <Visible>False</Visible> … … 245 245 </BootstrapperPackage> 246 246 </ItemGroup> 247 <ItemGroup /> 247 <ItemGroup> 248 <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj"> 249 <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project> 250 <Name>HeuristicLab.Problems.Instances-3.3</Name> 251 <Private>False</Private> 252 </ProjectReference> 253 </ItemGroup> 248 254 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 249 255 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Interfaces/ISingleObjectiveTestFunctionProblemEvaluator.cs
r9456 r9980 35 35 int MinimumProblemSize { get; } 36 36 int MaximumProblemSize { get; } 37 string FunctionName { get; } 37 38 38 39 ILookupParameter<RealVector> PointParameter { get; } -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Plugin.cs.frame
r9462 r9980 38 38 [PluginDependency("HeuristicLab.Optimization", "3.3")] 39 39 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 40 [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 40 41 [PluginDependency("HeuristicLab.Parameters", "3.3")] 41 42 [PluginDependency("HeuristicLab.Persistence", "3.3")] -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs
r9456 r9980 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 22 25 using HeuristicLab.Analysis; 23 26 using HeuristicLab.Common; … … 29 32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 33 using HeuristicLab.PluginInfrastructure; 31 using System; 32 using System.Collections.Generic; 33 using System.Linq; 34 using HeuristicLab.Problems.Instances; 34 35 35 36 namespace HeuristicLab.Problems.TestFunctions { … … 37 38 [StorableClass] 38 39 [Creatable("Problems")] 39 public sealed class SingleObjectiveTestFunctionProblem : SingleObjectiveHeuristicOptimizationProblem<ISingleObjectiveTestFunctionProblemEvaluator, IRealVectorCreator>, IStorableContent {40 public sealed class SingleObjectiveTestFunctionProblem : SingleObjectiveHeuristicOptimizationProblem<ISingleObjectiveTestFunctionProblemEvaluator, IRealVectorCreator>, IStorableContent, IProblemInstanceConsumer<SOTFData> { 40 41 public string Filename { get; set; } 41 42 … … 324 325 try { 325 326 BestKnownSolutionParameter.Value = Evaluator.GetBestKnownSolution(ProblemSize.Value); 326 } 327 catch (ArgumentException e) { 327 } catch (ArgumentException e) { 328 328 ErrorHandling.ShowErrorDialog(e); 329 329 ProblemSize.Value = Evaluator.MinimumProblemSize; … … 406 406 } 407 407 #endregion 408 409 public void Load(SOTFData data) { 410 Name = data.Name; 411 Description = data.Description; 412 Evaluator = (ISingleObjectiveTestFunctionProblemEvaluator)data.Evaluator; 413 } 408 414 } 409 415 }
Note: See TracChangeset
for help on using the changeset viewer.