Free cookie consent management tool by TermsFeed Policy Generator

Changeset 16598 for branches/2981_MRCPSP


Ignore:
Timestamp:
02/11/19 17:28:46 (6 years ago)
Author:
ddorfmei
Message:

#2981:

  • added problem definition
  • added improvers and crossover
  • added file importer
Location:
branches/2981_MRCPSP
Files:
21 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/2981_MRCPSP/HeuristicLab.Problem.Scheduling.MRCPSP/3.3/HeuristicLab.Problem.Scheduling.MRCPSP-3.3.csproj

    r16523 r16598  
    2222    <ErrorReport>prompt</ErrorReport>
    2323    <WarningLevel>4</WarningLevel>
     24    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2425  </PropertyGroup>
    2526  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    3839  </PropertyGroup>
    3940  <ItemGroup>
    40     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     41    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     42      <SpecificVersion>False</SpecificVersion>
     43      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     44    </Reference>
     45    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     46      <SpecificVersion>False</SpecificVersion>
     47      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath>
     48    </Reference>
     49    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     50      <SpecificVersion>False</SpecificVersion>
     51      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath>
     52    </Reference>
     53    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     54      <SpecificVersion>False</SpecificVersion>
     55      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath>
     56    </Reference>
     57    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     58      <SpecificVersion>False</SpecificVersion>
     59      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
     60    </Reference>
     61    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     62      <SpecificVersion>False</SpecificVersion>
     63      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     64    </Reference>
     65    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     66      <SpecificVersion>False</SpecificVersion>
     67      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     68    </Reference>
     69    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     70      <SpecificVersion>False</SpecificVersion>
     71      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     72    </Reference>
     73    <Reference Include="HeuristicLab.Optimizer-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     74      <SpecificVersion>False</SpecificVersion>
     75      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
     76    </Reference>
     77    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     78      <SpecificVersion>False</SpecificVersion>
     79      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     80    </Reference>
     81    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     82      <SpecificVersion>False</SpecificVersion>
     83      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     84    </Reference>
     85    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     86      <SpecificVersion>False</SpecificVersion>
    4187      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     88    </Reference>
     89    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     90      <SpecificVersion>False</SpecificVersion>
     91      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Random-3.3.dll</HintPath>
     92    </Reference>
     93    <Reference Include="HeuristicLab.SimSharp-3.0.11, Version=3.0.11.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     94      <SpecificVersion>False</SpecificVersion>
     95      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.SimSharp-3.0.11.dll</HintPath>
     96    </Reference>
     97    <Reference Include="SimSharp-3.0.11, Version=3.0.11.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     98      <SpecificVersion>False</SpecificVersion>
     99      <HintPath>..\..\..\..\trunk\bin\SimSharp-3.0.11.dll</HintPath>
    42100    </Reference>
    43101    <Reference Include="System" />
    … …  
    56114  </ItemGroup>
    57115  <ItemGroup>
     116    <Compile Include="Encoding\Activity.cs" />
     117    <Compile Include="Improvers\BasicMrcpspImprover.cs" />
     118    <Compile Include="Improvers\CriticalPathImprover.cs" />
     119    <Compile Include="Improvers\FeasibilityImprover.cs" />
     120    <Compile Include="Improvers\MrcpspImprover.cs" />
     121    <Compile Include="MultiModeFileImporter.cs" />
     122    <Compile Include="Encoding\Mode.cs" />
     123    <Compile Include="MultiModeResourceConstrainedProjectSchedulingProblem.cs" />
    58124    <Compile Include="Plugin.cs" />
    59125    <Compile Include="Properties\AssemblyInfo.cs" />
     126    <Compile Include="Encoding\ResourceCapacity.cs" />
     127    <Compile Include="Encoding\ResourceDemand.cs" />
     128    <Compile Include="Crossovers\MrcpspTwoPointCrossover.cs" />
     129    <Compile Include="Improvers\WorkContentImprover.cs" />
    60130  </ItemGroup>
     131  <ItemGroup />
    61132  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    62133  <PropertyGroup>

  • branches/2981_MRCPSP/HeuristicLab.Problem.Scheduling.MRCPSP/3.3/Plugin.cs.frame

    r16523 r16598  
    1 using HeuristicLab.PluginInfrastructure;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using HeuristicLab.PluginInfrastructure;
    223
    324namespace HeuristicLab.Problems.Scheduling.MRCPSP {
    425  [Plugin("HeuristicLab.Problems.Scheduling.MRCPSP", "3.3.15.$WCREV$")]
    526  [PluginFile("HeuristicLab.Problems.Scheduling.MRCPSP-3.3.dll", PluginFileType.Assembly)]
    6   public class Plugin : PluginBase {
     27  [PluginDependency("HeuristicLab.Common", "3.3")]
     28  [PluginDependency("HeuristicLab.Core", "3.3")]
     29  [PluginDependency("HeuristicLab.Collections", "3.3")]
     30  [PluginDependency("HeuristicLab.Data", "3.3")]
     31  [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
     32  [PluginDependency("HeuristicLab.Operators", "3.3")]
     33  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     34  [PluginDependency("HeuristicLab.Parameters", "3.3")]
     35  [PluginDependency("HeuristicLab.Persistence", "3.3")]
     36  [PluginDependency("HeuristicLab.Random", "3.3")]
     37  [PluginDependency("HeuristicLab.SimSharp", "3.0.11")]
     38  public class HeuristicLabMrspspPlugin : PluginBase {
    739  }
    840}

  • branches/2981_MRCPSP/HeuristicLab.Problem.Scheduling.MRCPSP/3.3/Properties/AssemblyInfo.cs.frame

    r16523 r16598  
    1 using System.Reflection;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System.Reflection;
    223using System.Runtime.InteropServices;
    324
    … …  
    1031[assembly: AssemblyCompany("HEAL")]
    1132[assembly: AssemblyProduct("HeuristicLab")]
    12 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2019 HEAL")]
    1334[assembly: AssemblyTrademark("")]
    1435[assembly: AssemblyCulture("")]
Note: See TracChangeset for help on using the changeset viewer.