Ignore:
Timestamp:
02/06/15 17:52:14 (6 years ago)
Author:
abeham
Message:

#2174: Integrated programmable problem into trunk

  • Fixed build configuration
  • Fixed some assembly references that had CopyLocal set to true
  • Added a missing license header
  • Cleaned some usings
  • Fixed the version number in ExternalEvaluation.GP
  • Added ProgrammableProblem and new ExternalEvaluationProblem as a reference to unit tests
  • Fixed plugin dependencies and assembly references
  • Changed icon of programmable problem to script icon
  • Fixed name clash in VRP that also had defined a "PermutationEncoding" class
  • (Hopefully) fixed all output paths
Location:
trunk/sources/HeuristicLab.Problems.Programmable.Views
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.Programmable.Views/3.3

    • Property svn:ignore
      •  

        old new  
        11*.user
         2bin
  • trunk/sources/HeuristicLab.Problems.Programmable.Views/3.3/HeuristicLab.Problems.Programmable.Views-3.3.csproj

    r11892 r11961  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     20    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
     
    2727    <DebugType>pdbonly</DebugType>
    2828    <Optimize>true</Optimize>
    29     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     29    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3030    <DefineConstants>TRACE</DefineConstants>
    3131    <ErrorReport>prompt</ErrorReport>
     
    3939    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    4040  </PropertyGroup>
    41   <ItemGroup>
    42     <Reference Include="HeuristicLab.CodeEditor-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    43       <SpecificVersion>False</SpecificVersion>
    44       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.CodeEditor-3.4.dll</HintPath>
    45     </Reference>
    46     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    47       <SpecificVersion>False</SpecificVersion>
    48       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    49       <Private>False</Private>
    50     </Reference>
    51     <Reference Include="HeuristicLab.Common-3.3">
    52       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    53       <Private>False</Private>
    54     </Reference>
    55     <Reference Include="HeuristicLab.Common.Resources-3.3">
    56       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    57       <Private>False</Private>
    58     </Reference>
    59     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    60       <SpecificVersion>False</SpecificVersion>
    61       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    62       <Private>False</Private>
    63     </Reference>
    64     <Reference Include="HeuristicLab.Core.Views-3.3">
    65       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    66       <Private>False</Private>
    67     </Reference>
    68     <Reference Include="HeuristicLab.Data.Views-3.3">
    69       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
    70       <Private>False</Private>
    71     </Reference>
    72     <Reference Include="HeuristicLab.MainForm-3.3">
    73       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    74       <Private>False</Private>
    75     </Reference>
    76     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    77       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    78       <Private>False</Private>
    79     </Reference>
    80     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    81       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    82       <Private>False</Private>
    83     </Reference>
    84     <Reference Include="HeuristicLab.Scripting-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    85       <SpecificVersion>False</SpecificVersion>
    86       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Scripting-3.3.dll</HintPath>
    87       <Private>False</Private>
    88     </Reference>
    89     <Reference Include="HeuristicLab.Scripting.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    90       <SpecificVersion>False</SpecificVersion>
    91       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Scripting.Views-3.3.dll</HintPath>
    92       <Private>False</Private>
    93     </Reference>
     41  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     42    <DebugSymbols>true</DebugSymbols>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     44    <DefineConstants>DEBUG;TRACE</DefineConstants>
     45    <DebugType>full</DebugType>
     46    <PlatformTarget>x64</PlatformTarget>
     47    <ErrorReport>prompt</ErrorReport>
     48    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     49  </PropertyGroup>
     50  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     51    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     52    <DefineConstants>TRACE</DefineConstants>
     53    <Optimize>true</Optimize>
     54    <DebugType>pdbonly</DebugType>
     55    <PlatformTarget>x64</PlatformTarget>
     56    <ErrorReport>prompt</ErrorReport>
     57    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     58  </PropertyGroup>
     59  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     60    <DebugSymbols>true</DebugSymbols>
     61    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     62    <DefineConstants>DEBUG;TRACE</DefineConstants>
     63    <DebugType>full</DebugType>
     64    <PlatformTarget>x86</PlatformTarget>
     65    <ErrorReport>prompt</ErrorReport>
     66    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     67  </PropertyGroup>
     68  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     69    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     70    <DefineConstants>TRACE</DefineConstants>
     71    <Optimize>true</Optimize>
     72    <DebugType>pdbonly</DebugType>
     73    <PlatformTarget>x86</PlatformTarget>
     74    <ErrorReport>prompt</ErrorReport>
     75    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     76  </PropertyGroup>
     77  <ItemGroup>
    9478    <Reference Include="System" />
    9579    <Reference Include="System.Core" />
     
    142126  </ItemGroup>
    143127  <ItemGroup>
     128    <EmbeddedResource Include="CreateNewSingleEncodingDialog.resx">
     129      <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
     130    </EmbeddedResource>
     131  </ItemGroup>
     132  <ItemGroup>
     133    <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3.4\HeuristicLab.CodeEditor-3.4.csproj">
     134      <Project>{c38691ae-ecb4-489a-a05d-b035554e0168}</Project>
     135      <Name>HeuristicLab.CodeEditor-3.4</Name>
     136      <Private>False</Private>
     137    </ProjectReference>
     138    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     139      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     140      <Name>HeuristicLab.Collections-3.3</Name>
     141      <Private>False</Private>
     142    </ProjectReference>
     143    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     144      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     145      <Name>HeuristicLab.Common.Resources-3.3</Name>
     146      <Private>False</Private>
     147    </ProjectReference>
     148    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     149      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     150      <Name>HeuristicLab.Common-3.3</Name>
     151      <Private>False</Private>
     152    </ProjectReference>
     153    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
     154      <Project>{e226881d-315f-423d-b419-a766fe0d8685}</Project>
     155      <Name>HeuristicLab.Core.Views-3.3</Name>
     156      <Private>False</Private>
     157    </ProjectReference>
     158    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     159      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     160      <Name>HeuristicLab.Core-3.3</Name>
     161      <Private>False</Private>
     162    </ProjectReference>
     163    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
     164      <Project>{72104a0b-90e7-42f3-9abe-9bbbadd4b943}</Project>
     165      <Name>HeuristicLab.Data.Views-3.3</Name>
     166      <Private>False</Private>
     167    </ProjectReference>
     168    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     169      <Project>{ab687bbe-1bfe-476b-906d-44237135431d}</Project>
     170      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     171      <Private>False</Private>
     172    </ProjectReference>
     173    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     174      <Project>{3bd61258-31da-4b09-89c0-4f71fef5f05a}</Project>
     175      <Name>HeuristicLab.MainForm-3.3</Name>
     176      <Private>False</Private>
     177    </ProjectReference>
    144178    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    145179      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     
    147181      <Private>False</Private>
    148182    </ProjectReference>
     183    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     184      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     185      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     186      <Private>False</Private>
     187    </ProjectReference>
    149188    <ProjectReference Include="..\..\HeuristicLab.Problems.Programmable\3.3\HeuristicLab.Problems.Programmable-3.3.csproj">
    150189      <Project>{ee07bff8-b23d-41f5-8ad7-ac9598d7a2c9}</Project>
     
    152191      <Private>False</Private>
    153192    </ProjectReference>
    154   </ItemGroup>
    155   <ItemGroup>
    156     <EmbeddedResource Include="CreateNewSingleEncodingDialog.resx">
    157       <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
    158     </EmbeddedResource>
     193    <ProjectReference Include="..\..\HeuristicLab.Scripting.Views\3.3\HeuristicLab.Scripting.Views-3.3.csproj">
     194      <Project>{0c2917c8-7aa8-4e18-800a-c4d064f992ed}</Project>
     195      <Name>HeuristicLab.Scripting.Views-3.3</Name>
     196      <Private>False</Private>
     197    </ProjectReference>
     198    <ProjectReference Include="..\..\HeuristicLab.Scripting\3.3\HeuristicLab.Scripting-3.3.csproj">
     199      <Project>{21977cc3-1757-4b3b-87bd-ff817aaa900f}</Project>
     200      <Name>HeuristicLab.Scripting-3.3</Name>
     201      <Private>False</Private>
     202    </ProjectReference>
    159203  </ItemGroup>
    160204  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/sources/HeuristicLab.Problems.Programmable.Views/3.3/Plugin.cs.frame

    r10850 r11961  
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
    2828  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
     29  [PluginDependency("HeuristicLab.CodeEditor", "3.4")]
    2930  [PluginDependency("HeuristicLab.Core", "3.3")]
    3031  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    31   [PluginDependency("HeuristicLab.Data.Views", "3.3")]
    3232  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3333  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.