Changeset 16834


Ignore:
Timestamp:
04/19/19 09:41:25 (4 months ago)
Author:
fholzing
Message:

#2864: Made the branch compile again (References, new Persistence, ...)

Location:
branches/2864_PermutationProblems
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PermutationProblems/3.3/HeuristicLab.Problems.Instances.PermutationProblems-3.3.csproj

    r16013 r16834  
    1010    <RootNamespace>HeuristicLab.Problems.Instances.PermutationProblems</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Problems.Instances.PermutationProblems-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />
  • branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PermutationProblems/3.3/LOP/LOPInstanceProvider.cs

    r16013 r16834  
    99namespace HeuristicLab.Problems.Instances.PermutationProblems.LinearOrdering {
    1010  public abstract class LOPInstanceProvider : ProblemInstanceProvider<LOPData> {
    11     public override string ReferencePublication
    12     {
     11    public override string ReferencePublication {
    1312      get { return "Martí, R., & Reinelt, G. (2011). The Linear Ordering Problem. Applied Mathematical Sciences. Springer Berlin Heidelberg. https://doi.org/10.1007/978-3-642-16729-4"; }
    1413    }
     
    3938    }
    4039
    41     public override bool CanImportData
    42     {
     40    public override bool CanImportData {
    4341      get { return true; }
    4442    }
     
    6260    }
    6361
    64     public override bool CanExportData
    65     {
     62    public override bool CanExportData {
    6663      get { return false; }
    6764    }
  • branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PermutationProblems/3.3/Plugin.cs

    r16011 r16834  
    2323
    2424namespace HeuristicLab.Problems.Instances.PermutationProblems {
    25   [Plugin("HeuristicLab.Problems.Instances.PermutationProblems", "3.3.15.16005")]
     25  [Plugin("HeuristicLab.Problems.Instances.PermutationProblems", "3.3.15.16013")]
    2626  [PluginFile("HeuristicLab.Problems.Instances.PermutationProblems-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
  • branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PermutationProblems/3.3/Properties/AssemblyInfo.cs

    r16010 r16834  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.15.16009")]
     56[assembly: AssemblyFileVersion("3.3.15.16013")]
  • branches/2864_PermutationProblems/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

    r16565 r16834  
    1919    <DebugType>full</DebugType>
    2020    <Optimize>false</Optimize>
    21     <OutputPath>..\..\bin\</OutputPath>
     21    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    2222    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2323    <ErrorReport>prompt</ErrorReport>
     
    2828    <DebugType>pdbonly</DebugType>
    2929    <Optimize>true</Optimize>
    30     <OutputPath>..\..\bin\</OutputPath>
     30    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    3131    <DefineConstants>TRACE</DefineConstants>
    3232    <ErrorReport>prompt</ErrorReport>
     
    4242  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    4343    <DebugSymbols>true</DebugSymbols>
    44     <OutputPath>..\..\bin\</OutputPath>
     44    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    4545    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4646    <DebugType>full</DebugType>
     
    5959  </PropertyGroup>
    6060  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    61     <OutputPath>..\..\bin\</OutputPath>
     61    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    6262    <DefineConstants>TRACE</DefineConstants>
    6363    <Optimize>true</Optimize>
     
    7878  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    7979    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>..\..\bin\</OutputPath>
     80    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    8181    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8282    <DebugType>full</DebugType>
     
    9595  </PropertyGroup>
    9696  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    97     <OutputPath>..\..\bin\</OutputPath>
     97    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    9898    <DefineConstants>TRACE</DefineConstants>
    9999    <Optimize>true</Optimize>
     
    112112  </PropertyGroup>
    113113  <ItemGroup>
     114    <Reference Include="HeuristicLab.Common-3.3">
     115      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath>
     116    </Reference>
     117    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     118      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     119    </Reference>
    114120    <Reference Include="Microsoft.CSharp" />
    115121    <Reference Include="System" />
     
    121127    <Compile Include="ProblemInstanceManager.cs" />
    122128    <Compile Include="IProblemInstanceExporter.cs" />
     129    <Compile Include="Types\FSSPData.cs" />
    123130    <Compile Include="Types\GCPData.cs" />
     131    <Compile Include="Types\LOPData.cs" />
    124132    <Compile Include="Types\PTSPData.cs" />
    125133    <Compile Include="Types\ATSPData.cs" />
     
    148156  <ItemGroup>
    149157    <None Include="HeuristicLab.snk" />
    150   </ItemGroup>
    151   <ItemGroup>
    152     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    153       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    154       <Name>HeuristicLab.Common-3.3</Name>
    155       <Private>False</Private>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    158       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    159       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    160       <Private>False</Private>
    161     </ProjectReference>
    162158  </ItemGroup>
    163159  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems.Views/3.3/HeuristicLab.Problems.PermutationProblems.Views-3.3.csproj

    r16006 r16834  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     
    1111    <RootNamespace>HeuristicLab.Problems.PermutationProblems.Views</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.PermutationProblems.Views-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
     
    148148    </Reference>
    149149    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    150     <Reference Include="HeuristicLab.Problems.Instances-3.3">
    151       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    152     </Reference>
    153150    <Reference Include="System" />
    154151    <Reference Include="System.Core" />
     
    174171  </ItemGroup>
    175172  <ItemGroup>
     173    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     174      <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
     175      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     176    </ProjectReference>
    176177    <ProjectReference Include="..\..\HeuristicLab.Problems.PermutationProblems\3.3\HeuristicLab.Problems.PermutationProblems-3.3.csproj">
    177178      <Project>{51650b00-4ca6-41ff-8cb6-165fcacc3b51}</Project>
  • branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems.Views/3.3/Plugin.cs

    r16007 r16834  
    2323
    2424namespace HeuristicLab.Problems.PermutationProblems.Views {
    25   [Plugin("HeuristicLab.Problems.PermutationProblems.Views", "3.3.15.16006")]
     25  [Plugin("HeuristicLab.Problems.PermutationProblems.Views", "3.3.15.16011")]
    2626  [PluginFile("HeuristicLab.Problems.PermutationProblems.Views-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems.Views/3.3/Properties/AssemblyInfo.cs

    r16010 r16834  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.15.16007")]
     56[assembly: AssemblyFileVersion("3.3.15.16011")]
  • branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/HeuristicLab.Problems.PermutationProblems-3.3.csproj

    r15686 r16834  
    1010    <RootNamespace>HeuristicLab.Problems.PermutationProblems</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Problems.PermutationProblems-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />
     
    3838  </PropertyGroup>
    3939  <ItemGroup>
     40    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     41      <SpecificVersion>False</SpecificVersion>
     42      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     43    </Reference>
    4044    <Reference Include="HeuristicLab.Collections-3.3">
    4145      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     
    104108    </ProjectReference>
    105109  </ItemGroup>
    106   <ItemGroup />
    107110  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    108111  <PropertyGroup>
  • branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/LinearOrderingProblem.cs

    r16014 r16834  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    2829using HeuristicLab.Optimization;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.Problems.Instances;
    3232
     
    3434  [Item("Linear Ordering Problem (LOP)", "Represents a Linear Ordering Problem")]
    3535  [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
    36   [StorableClass]
     36  [StorableType("A84D3AAE-8AD2-4502-ACD3-70E62F12841B")]
    3737  public sealed class LinearOrderingProblem : SingleObjectiveBasicProblem<PermutationEncoding>, IProblemInstanceConsumer<LOPData>, IProblemInstanceExporter<LOPData>, IStorableContent {
    3838    private static readonly LOPData DefaultInstance = new LOPData() {
     
    4848    };
    4949
    50     public OptionalValueParameter<Permutation> BestKnownSolutionParameter
    51     {
     50    public OptionalValueParameter<Permutation> BestKnownSolutionParameter {
    5251      get { return (OptionalValueParameter<Permutation>)Parameters["BestKnownSolution"]; }
    5352    }
    54     public Permutation BestKnownSolution
    55     {
     53    public Permutation BestKnownSolution {
    5654      get { return BestKnownSolutionParameter.Value; }
    57       set
    58       {
     55      set {
    5956        BestKnownSolutionParameter.Value = value;
    6057      }
    6158    }
    62 
    63     public ValueParameter<DoubleMatrix> MatrixParameter
    64     {
     59    public ValueParameter<DoubleMatrix> MatrixParameter {
    6560      get { return (ValueParameter<DoubleMatrix>)Parameters["Matrix"]; }
    6661    }
    67     public DoubleMatrix Matrix
    68     {
     62    public DoubleMatrix Matrix {
    6963      get { return MatrixParameter.Value; }
    7064      set { MatrixParameter.Value = value; }
     
    7468
    7569    [StorableConstructor]
    76     private LinearOrderingProblem(bool deserializing) : base(deserializing) { }
     70    private LinearOrderingProblem(StorableConstructorFlag _) : base(_) { }
    7771    private LinearOrderingProblem(LinearOrderingProblem original, Cloner cloner) : base(original, cloner) { }
    7872    public LinearOrderingProblem() {
     
    112106      }
    113107    }
    114 
    115108    public LOPData Export() {
    116109      var result = new LOPData {
  • branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/PermutationFlowshopSchedulingProblem.cs

    r16011 r16834  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    2829using HeuristicLab.Optimization;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.Problems.Instances;
    32 
    3332
    3433namespace HeuristicLab.Problems.PermutationProblems {
    3534  [Item("Permutation Flowshop Scheduling Problem (PFSP)", "Represents a Permutation Flowshop Scheduling Problem")]
    3635  [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
    37   [StorableClass]
     36  [StorableType("18A7BE3A-5605-493D-A457-12D8B340F489")]
    3837  public sealed class PermutationFlowshopSchedulingProblem : SingleObjectiveBasicProblem<PermutationEncoding>, IProblemInstanceConsumer<FSSPData>, IProblemInstanceExporter<FSSPData> {
    3938    #region Fields
     
    5554
    5655    #region Getter/Setter
    57     public OptionalValueParameter<Permutation> BestKnownSolutionParameter
    58     {
     56    public OptionalValueParameter<Permutation> BestKnownSolutionParameter {
    5957      get { return (OptionalValueParameter<Permutation>)Parameters["BestKnownSolution"]; }
    6058    }
    61     public OptionalValueParameter<DoubleMatrix> JobMatrixParameter
    62     {
     59    public OptionalValueParameter<DoubleMatrix> JobMatrixParameter {
    6360      get { return (OptionalValueParameter<DoubleMatrix>)Parameters["JobMatrix"]; }
    6461    }
    65     public Permutation BestKnownSolution
    66     {
     62    public Permutation BestKnownSolution {
    6763      get { return BestKnownSolutionParameter.Value; }
    68       set
    69       {
     64      set {
    7065        BestKnownSolutionParameter.Value = value;
    7166        if (BestKnownSolutionChanged != null) { OnBestKnownSolutionChanged(); }
    7267      }
    7368    }
    74     public DoubleMatrix JobMatrix
    75     {
     69    public DoubleMatrix JobMatrix {
    7670      get { return JobMatrixParameter.Value; }
    7771      set { JobMatrixParameter.Value = value; }
     
    8377    #region Ctor
    8478    [StorableConstructor]
    85     private PermutationFlowshopSchedulingProblem(bool deserializing) : base(deserializing) { }
     79    private PermutationFlowshopSchedulingProblem(StorableConstructorFlag _) : base(_) { }
     80
    8681    private PermutationFlowshopSchedulingProblem(PermutationFlowshopSchedulingProblem original, Cloner cloner) : base(original, cloner) { }
    8782    public PermutationFlowshopSchedulingProblem() {
  • branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/Plugin.cs

    r16011 r16834  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Problems.PermutationProblems {
    25   [Plugin("HeuristicLab.Problems.PermutationProblems", "3.3.15.16003")]
     24namespace HeuristicLab.Problems.PermutationProblems
     25{
     26  [Plugin("HeuristicLab.Problems.PermutationProblems", "3.3.15.16014")]
    2627  [PluginFile("HeuristicLab.Problems.PermutationProblems-3.3.dll", PluginFileType.Assembly)]
    2728  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/Properties/AssemblyInfo.cs

    r16010 r16834  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.15.16007")]
     56[assembly: AssemblyFileVersion("3.3.15.16014")]
Note: See TracChangeset for help on using the changeset viewer.