- Timestamp:
- 08/01/13 13:01:40 (11 years ago)
- Location:
- branches/HeuristicLab.EvolutionaryTracking
- Files:
-
- 3 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionaryTracking
- Property svn:ignore
-
old new 1 *.suo 2 _ReSharper.HeuristicLab.Tracking 1 _ReSharper.Sliding Window GP 3 2 bin
-
- Property svn:mergeinfo changed
/branches/Sliding Window GP (added) merged: 7820,7837,7845,7850,9047,9126,9145,9162-9165 -
Property
svn:global-ignores
set to
_ReSharper.HeuristicLab.Tracking
- Property svn:ignore
-
branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj
r8806 r9835 41 41 <DebugType>full</DebugType> 42 42 <Optimize>false</Optimize> 43 <OutputPath> $(SolutionDir)\bin\</OutputPath>43 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <ErrorReport>prompt</ErrorReport> … … 50 50 <DebugType>pdbonly</DebugType> 51 51 <Optimize>true</Optimize> 52 <OutputPath> $(SolutionDir)\bin\</OutputPath>52 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 53 53 <DefineConstants>TRACE</DefineConstants> 54 54 <ErrorReport>prompt</ErrorReport> … … 61 61 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 62 62 <DebugSymbols>true</DebugSymbols> 63 <OutputPath> $(SolutionDir)\bin\</OutputPath>63 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 64 64 <DefineConstants>DEBUG;TRACE</DefineConstants> 65 65 <DebugType>full</DebugType> … … 69 69 </PropertyGroup> 70 70 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 71 <OutputPath> $(SolutionDir)\bin\</OutputPath>71 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 72 72 <DefineConstants>TRACE</DefineConstants> 73 73 <DocumentationFile> … … 81 81 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> 82 82 <DebugSymbols>true</DebugSymbols> 83 <OutputPath> $(SolutionDir)\bin\</OutputPath>83 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 84 84 <DefineConstants>DEBUG;TRACE</DefineConstants> 85 85 <DebugType>full</DebugType> … … 89 89 </PropertyGroup> 90 90 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> 91 <OutputPath> $(SolutionDir)\bin\</OutputPath>91 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 92 92 <DefineConstants>TRACE</DefineConstants> 93 93 <DocumentationFile> … … 100 100 </PropertyGroup> 101 101 <ItemGroup> 102 <Reference Include="HeuristicLab.Collections-3.3"> 103 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath> 104 <Private>False</Private> 105 </Reference> 106 <Reference Include="HeuristicLab.Common-3.3"> 107 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath> 108 <Private>False</Private> 109 </Reference> 110 <Reference Include="HeuristicLab.Core-3.3"> 111 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath> 112 <Private>False</Private> 113 </Reference> 114 <Reference Include="HeuristicLab.Data-3.3"> 115 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath> 116 <Private>False</Private> 117 </Reference> 118 <Reference Include="HeuristicLab.Operators-3.3"> 119 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath> 120 <Private>False</Private> 121 </Reference> 122 <Reference Include="HeuristicLab.Optimization-3.3"> 123 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath> 124 <Private>False</Private> 125 </Reference> 126 <Reference Include="HeuristicLab.Parameters-3.3"> 127 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath> 128 <Private>False</Private> 129 </Reference> 130 <Reference Include="HeuristicLab.Persistence-3.3"> 131 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath> 132 <Private>False</Private> 133 </Reference> 134 <Reference Include="HeuristicLab.PluginInfrastructure-3.3"> 135 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 136 <Private>False</Private> 137 </Reference> 102 138 <Reference Include="System" /> 103 139 <Reference Include="System.Core"> … … 144 180 </ItemGroup> 145 181 <ItemGroup> 146 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">147 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>148 <Name>HeuristicLab.Collections-3.3</Name>149 <Private>False</Private>150 </ProjectReference>151 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">152 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>153 <Name>HeuristicLab.Common-3.3</Name>154 <Private>False</Private>155 </ProjectReference>156 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">157 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>158 <Name>HeuristicLab.Core-3.3</Name>159 <Private>False</Private>160 </ProjectReference>161 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">162 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>163 <Name>HeuristicLab.Data-3.3</Name>164 <Private>False</Private>165 </ProjectReference>166 <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">167 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>168 <Name>HeuristicLab.Operators-3.3</Name>169 <Private>False</Private>170 </ProjectReference>171 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">172 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>173 <Name>HeuristicLab.Optimization-3.3</Name>174 <Private>False</Private>175 </ProjectReference>176 <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">177 <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>178 <Name>HeuristicLab.Parameters-3.3</Name>179 <Private>False</Private>180 </ProjectReference>181 <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">182 <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>183 <Name>HeuristicLab.Persistence-3.3</Name>184 <Private>False</Private>185 </ProjectReference>186 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">187 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>188 <Name>HeuristicLab.PluginInfrastructure-3.3</Name>189 <Private>False</Private>190 </ProjectReference>191 </ItemGroup>192 <ItemGroup>193 182 <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> 194 183 <Visible>False</Visible> -
branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3/Selector.cs
r9456 r9835 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 28 29 using CloneMapType = HeuristicLab.Core.ItemDictionary<HeuristicLab.Core.IItem, HeuristicLab.Core.IItem>; 30 29 31 namespace HeuristicLab.Selection { 30 32 /// <summary> … … 34 36 [StorableClass] 35 37 public abstract class Selector : SingleSuccessorOperator { 38 protected const string GlobalCloneMapParameterName = "GlobalCloneMap"; 39 36 40 public override bool CanChangeName { 37 41 get { return false; } … … 45 49 } 46 50 51 public LookupParameter<CloneMapType> GlobalCloneMapParameter { 52 get { return (LookupParameter<CloneMapType>)Parameters[GlobalCloneMapParameterName]; } 53 } 54 55 public CloneMapType GlobalCloneMap { 56 get { return GlobalCloneMapParameter.ActualValue; } 57 } 47 58 [StorableConstructor] 48 59 protected Selector(bool deserializing) : base(deserializing) { } 49 60 protected Selector(Selector original, Cloner cloner) : base(original, cloner) { } 50 61 62 [StorableHook(HookType.AfterDeserialization)] 63 private void AfterDeserialization() { 64 if (!Parameters.ContainsKey("CurrentScope")) 65 Parameters.Add(new ScopeParameter("CurrentScope", "The current scope from which sub-scopes should be selected.")); 66 if (!Parameters.ContainsKey(GlobalCloneMapParameterName)) 67 Parameters.Add(new LookupParameter<CloneMapType>(GlobalCloneMapParameterName, "A global map keeping track of trees and their clones (made during selection).")); 68 } 69 51 70 protected Selector() 52 71 : base() { 53 72 Parameters.Add(new ScopeParameter("CurrentScope", "The current scope from which sub-scopes should be selected.")); 73 Parameters.Add(new LookupParameter<CloneMapType>(GlobalCloneMapParameterName, "A global map keeping track of trees and their clones (made during selection).")); 54 74 } 55 75 56 76 public sealed override IOperation Apply() { 57 77 List<IScope> scopes = new List<IScope>(CurrentScope.SubScopes); 78 79 if (GlobalCloneMap == null) { 80 var gScope = ExecutionContext.Scope; 81 while (gScope.Parent != null) gScope = gScope.Parent; 82 gScope.Variables.Add(new Variable(GlobalCloneMapParameterName, new CloneMapType())); 83 } 58 84 IScope[] selected = Select(scopes); 59 85
Note: See TracChangeset
for help on using the changeset viewer.