Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/19/11 11:08:33 (12 years ago)
Author:
svonolfe
Message:

Refactored solution (#1542)

Location:
branches/MPI/HeuristicLab.Operators.MPISupport/3.3
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • branches/MPI/HeuristicLab.Operators.MPISupport/3.3

    • Property svn:ignore

      •  

        old new  
        33obj
        44HeuristicLabOperatorsMPISupportPlugin.cs
         5Plugin.cs

  • branches/MPI/HeuristicLab.Operators.MPISupport/3.3/HeuristicLab.Operators.MPISupport-3.3.csproj

    r6393 r7205  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    9696  </PropertyGroup>
    9797  <ItemGroup>
    98     <Reference Include="Accessibility">
    99       <EmbedInteropTypes>True</EmbedInteropTypes>
     98    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     99      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     100      <Private>False</Private>
    100101    </Reference>
    101     <Reference Include="HeuristicLab.Collections-3.3">
    102       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     102    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     103      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     104      <Private>False</Private>
    103105    </Reference>
    104     <Reference Include="HeuristicLab.Common-3.3">
    105       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     106    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     108      <Private>False</Private>
    106109    </Reference>
    107     <Reference Include="HeuristicLab.Core-3.3">
    108       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     110    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     112      <Private>False</Private>
    109113    </Reference>
    110     <Reference Include="HeuristicLab.Operators-3.3">
    111       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     114    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     115      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     116      <Private>False</Private>
    112117    </Reference>
    113     <Reference Include="HeuristicLab.Optimization-3.3">
    114       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     118    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     119      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     120      <Private>False</Private>
    115121    </Reference>
    116     <Reference Include="HeuristicLab.Persistence-3.3">
    117       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    118     </Reference>
    119     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    120       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     122    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     123      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     124      <Private>False</Private>
    121125    </Reference>
    122126    <Reference Include="MPI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=29b4a045737654fe, processorArchitecture=MSIL">
    … …  
    136140  </ItemGroup>
    137141  <ItemGroup>
    138     <None Include="HeuristicLabOperatorsMPISupportPlugin.cs.frame" />
    139     <Compile Include="HeuristicLabOperatorsMPISupportPlugin.cs" />
    140142    <Compile Include="MPITransportWrapper.cs" />
    141143    <Compile Include="MPIUnidirectionalRingMigrator.cs" />
     144    <Compile Include="Plugin.cs" />
    142145    <Compile Include="Properties\AssemblyInfo.cs" />
    143146  </ItemGroup>
    144147  <ItemGroup>
     148    <None Include="Properties\AssemblyInfo.cs.frame" />
    145149    <None Include="HeuristicLab.snk" />
    146     <None Include="Properties\AssemblyInfo.frame" />
     150    <None Include="Plugin.cs.frame" />
    147151  </ItemGroup>
    148152  <ItemGroup>
    … …  
    177181set Outdir=$(Outdir)
    178182
    179 call PreBuildEvent.cmd
    180 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabOperatorsMPISupportPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabOperatorsMPISupportPlugin.cs"</PreBuildEvent>
     183call PreBuildEvent.cmd</PreBuildEvent>
    181184  </PropertyGroup>
    182185  <PropertyGroup>
    183     <PostBuildEvent>set ProjectName=$(ProjectName)
    184 set Source=$(TargetPath)
    185 set Configuration=$(ConfigurationName)
    186 set Platform=$(PlatformName)
    187 set SolutionDir=$(SolutionDir)
    188 
    189 if exist "$(SolutionDir)CustomPostBuild.cmd" call "$(SolutionDir)CustomPostBuild.cmd"</PostBuildEvent>
     186    <PostBuildEvent>
     187    </PostBuildEvent>
    190188  </PropertyGroup>
    191189</Project>

  • branches/MPI/HeuristicLab.Operators.MPISupport/3.3/MPIUnidirectionalRingMigrator.cs

    r6354 r7205  
    4848      if (MPI.Communicator.world != null) {
    4949        int size = MPI.Communicator.world.Size;
    50         if (size > 2) {
     50        if (size > 1) {
    5151          int i = MPI.Communicator.world.Rank;
    5252          IScope scope = ExecutionContext.Scope;
    … …  
    5656          int recipent = i + 1;
    5757          if (recipent == size)
    58             recipent = 1;
     58            recipent = 0;
    5959
    6060          Console.WriteLine("MIGRATE " + i + " TO " + recipent);
    … …  
    6464          IScope immigrants = null;
    6565          int sender = i - 1;
    66           if (sender < 1)
     66          if (sender < 0)
    6767            sender = size - 1;
    6868
Note: See TracChangeset for help on using the changeset viewer.