Changeset 7141

Timestamp:

12/06/11 18:33:23 (13 years ago)

Author:

epitzer

Message:

#1696 correct output paths and add VRP analysis project

Location:

branches/FitnessLandscapeAnalysis

Files:

• Build.cmd (added)
• HeuristicLab.Analysis.FitnessLandscape (modified) (1 prop)
• HeuristicLab.Analysis.FitnessLandscape.VRP (added)
• HeuristicLab.Analysis.FitnessLandscape.VRP/DistanceCalcualtors (added)
• HeuristicLab.Analysis.FitnessLandscape.VRP/DistanceCalcualtors/VRPDistanceCalculator.cs (added)
• HeuristicLab.Analysis.FitnessLandscape.VRP/HeuristicLab.Analysis.FitnessLandscape.VRP.csproj (added)
• HeuristicLab.Analysis.FitnessLandscape.VRP/HeuristicLab.snk (added)
• HeuristicLab.Analysis.FitnessLandscape.VRP/HeuristicLabAnalysisFitnessLandscapeVRPPlugin.cs.frame (added)
• HeuristicLab.Analysis.FitnessLandscape.VRP/Properties (added)
• HeuristicLab.Analysis.FitnessLandscape.VRP/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Analysis.FitnessLandscape.Views/HeuristicLab.Analysis.FitnessLandscape.Views.csproj (modified) (5 diffs)
• HeuristicLab.Analysis.FitnessLandscape.Views/Properties (added)
• HeuristicLab.Analysis.FitnessLandscape.Views/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Analysis.FitnessLandscape.sln (modified) (2 diffs)
• HeuristicLab.Analysis.FitnessLandscape/Build.cmd (deleted)
• HeuristicLab.Analysis.FitnessLandscape/HeuristicLab.Analysis.FitnessLandscape.csproj (modified) (5 diffs)
• HeuristicLab.Analysis.FitnessLandscape/HeuristicLabAnalysisFitnessLandscapePlugin.cs (deleted)
• HeuristicLab.Problems.NK.Views (added)
• HeuristicLab.Problems.NK.Views/BoolMatrixBitmapView.Designer.cs (added)
• HeuristicLab.Problems.NK.Views/BoolMatrixBitmapView.cs (added)
• HeuristicLab.Problems.NK.Views/BoolMatrixBitmapView.resx (added)
• HeuristicLab.Problems.NK.Views/HeuristicLab.Problems.NK.Views.csproj (added)
• HeuristicLab.Problems.NK.Views/HeuristicLab.snk (added)
• HeuristicLab.Problems.NK.Views/HeuristicLabProblemsNKViewsPlugin.cs.frame (added)
• HeuristicLab.Problems.NK.Views/Properties (added)
• HeuristicLab.Problems.NK.Views/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Problems.NK/BoolMatrixBitmapView.Designer.cs (deleted)
• HeuristicLab.Problems.NK/BoolMatrixBitmapView.cs (deleted)
• HeuristicLab.Problems.NK/BoolMatrixBitmapView.resx (deleted)
• HeuristicLab.Problems.NK/HeuristicLab.Problems.NK.csproj (modified) (8 diffs)
• HeuristicLab.Problems.NK/HeuristicLabProblemsNKPlugin.cs.frame (modified) (2 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape

@@ -1 +1 @@
 bin
 obj
+HeuristicLabAnalysisFitnessLandscapePlugin.cs

@@ -1 +1 @@
 bin
 obj
+HeuristicLabAnalysisFitnessLandscapePlugin.cs

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.Views/HeuristicLab.Analysis.FitnessLandscape.Views.csproj

@@ -18 +18 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -26 +26 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -33 +33 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -48 +48 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -78 +78 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.sln

@@ -7 +7 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis.FitnessLandscape.Views", "HeuristicLab.Analysis.FitnessLandscape.Views\HeuristicLab.Analysis.FitnessLandscape.Views.csproj", "{09F27845-A5B0-476E-901E-9D61576C8581}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.NK.Views", "HeuristicLab.Problems.NK.Views\HeuristicLab.Problems.NK.Views.csproj", "{F64A0A99-33FB-4250-AABF-73AD53D17763}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis.FitnessLandscape.VRP", "HeuristicLab.Analysis.FitnessLandscape.VRP\HeuristicLab.Analysis.FitnessLandscape.VRP.csproj", "{67CDB1E2-B0EE-4986-92AD-F320EBAF9088}"
 EndProject
 Global
@@ -54 +58 @@
     {09F27845-A5B0-476E-901E-9D61576C8581}.Release|x86.ActiveCfg = Release|x86
     {09F27845-A5B0-476E-901E-9D61576C8581}.Release|x86.Build.0 = Release|x86
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Debug|x64.ActiveCfg = Debug|x64
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Debug|x64.Build.0 = Debug|x64
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Debug|x86.ActiveCfg = Debug|x86
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Debug|x86.Build.0 = Debug|x86
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Release|Any CPU.Build.0 = Release|Any CPU
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Release|x64.ActiveCfg = Release|x64
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Release|x64.Build.0 = Release|x64
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Release|x86.ActiveCfg = Release|x86
+    {F64A0A99-33FB-4250-AABF-73AD53D17763}.Release|x86.Build.0 = Release|x86
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Debug|x64.ActiveCfg = Debug|x64
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Debug|x64.Build.0 = Debug|x64
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Debug|x86.ActiveCfg = Debug|x86
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Debug|x86.Build.0 = Debug|x86
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Release|Any CPU.Build.0 = Release|Any CPU
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Release|x64.ActiveCfg = Release|x64
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Release|x64.Build.0 = Release|x64
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Release|x86.ActiveCfg = Release|x86
+    {67CDB1E2-B0EE-4986-92AD-F320EBAF9088}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/HeuristicLab.Analysis.FitnessLandscape.csproj

@@ -48 +48 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -55 +55 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -62 +62 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\x86\Release\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -71 +71 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -78 +78 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/HeuristicLab.Problems.NK.csproj

@@ -26 +26 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -54 +54 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -71 +71 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -86 +86 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -114 +114 @@
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Core.Views-3.3">
-      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="HeuristicLab.Data-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Data.Views-3.3">
-      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.MainForm-3.3">
-      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
-      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Operators-3.3">
@@ -153 +141 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -165 +152 @@
     <Compile Include="BinaryVectorComparers\AverageBitBinaryVectorComparer.cs" />
     <Compile Include="BinaryVectorComparers\MedianBitBinaryVectorComparer.cs" />
-    <Compile Include="BoolMatrixBitmapView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="BoolMatrixBitmapView.Designer.cs">
-      <DependentUpon>BoolMatrixBitmapView.cs</DependentUpon>
-    </Compile>
     <Compile Include="InteractionInitializers\LimitedRandomInteractionsInitializer.cs" />
     <Compile Include="InteractionInitializers\IncreasingBlockSizeInteractionsInitializer.cs" />
@@ -197 +178 @@
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="BoolMatrixBitmapView.resx">
-      <DependentUpon>BoolMatrixBitmapView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/HeuristicLabProblemsNKPlugin.cs.frame

@@ -22 +22 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Analysis.FitnessLandscape {
+namespace HeuristicLab.Problems.NK {
 
   [Plugin("HeuristicLab.Problems.NK", "3.3.0.$WCREV$")]
@@ -37 +37 @@
   [PluginDependency("HeuristicLab.Persistence", "3.3")]  
   [PluginDependency("HeuristicLab.Random", "3.3")]    
-  public class HeuristicLabAnalysisFitnessLandscapePlugin : PluginBase { }
+  public class HeuristicProblemsNKPlugin : PluginBase { }
 }

@@ -1 +1 @@
 bin
 obj
+HeuristicLabAnalysisFitnessLandscapePlugin.cs