Changeset 7319 for branches/GeneralizedQAP
- Timestamp:
- 01/11/12 17:47:04 (12 years ago)
- Location:
- branches/GeneralizedQAP
- Files:
-
- 16 added
- 14 edited
-
Build.cmd (modified) (3 diffs)
-
GeneralizedQAP.sln (modified) (1 diff)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.Designer.cs (modified) (2 diffs)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs (modified) (5 diffs)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.resx (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj (modified) (3 diffs)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/Plugin.cs.frame (modified) (2 diffs)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs (modified) (1 diff)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPEvaluator.cs (modified) (1 diff)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/ExtensionMethods.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs (modified) (1 diff)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (4 diffs)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj (modified) (3 diffs)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj.user (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IEquipmentAwareGQAPOperator.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPCrossover.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPEvaluator.cs (modified) (1 diff)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPManipulator.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPOperator.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/ILocationAwareGQAPOperator.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/DemandEquivalentSwapEquipmentManipluator.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/DiscreteLocationCrossover.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GQAPCrossover.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GQAPManipulator.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/RelocateEquipmentManipluator.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/SwapEquipmentManipluator.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/SwapLocationManipulator.cs (added)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Plugin.cs.frame (modified) (1 diff)
-
HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/GeneralizedQAP/Build.cmd
r6956 r7319 1 1 @ECHO OFF 2 2 3 SET CLEANBEFOREBUILD= 13 SET CLEANBEFOREBUILD=0 4 4 5 5 SET SELECTED= … … 49 49 50 50 :prompt_config 51 SET /P CONFIGURATION=Which configuration to build [ Debug]:52 IF "%CONFIGURATION%"=="" SET CONFIGURATION= Debug51 SET /P CONFIGURATION=Which configuration to build [Release]: 52 IF "%CONFIGURATION%"=="" SET CONFIGURATION=Release 53 53 54 54 :platform_selection … … 77 77 ) 78 78 ECHO Building ... 79 %MSBUILDPATH%msbuild.exe %SELECTED% /target: Build /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly79 %MSBUILDPATH%msbuild.exe %SELECTED% /target:Rebuild /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly 80 80 81 81 ECHO. -
branches/GeneralizedQAP/GeneralizedQAP.sln
r7312 r7319 9 9 GlobalSection(SolutionConfigurationPlatforms) = preSolution 10 10 Debug|Any CPU = Debug|Any CPU 11 Debug|x64 = Debug|x6412 Debug|x86 = Debug|x8613 11 Release|Any CPU = Release|Any CPU 14 Release|x64 = Release|x6415 Release|x86 = Release|x8616 12 EndGlobalSection 17 13 GlobalSection(ProjectConfigurationPlatforms) = postSolution 18 14 {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 19 15 {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|Any CPU.Build.0 = Debug|Any CPU 20 {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x64.ActiveCfg = Debug|x6421 {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x64.Build.0 = Debug|x6422 {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x86.ActiveCfg = Debug|x8623 {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x86.Build.0 = Debug|x8624 16 {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|Any CPU.ActiveCfg = Release|Any CPU 25 17 {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|Any CPU.Build.0 = Release|Any CPU 26 {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x64.ActiveCfg = Release|x6427 {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x64.Build.0 = Release|x6428 {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x86.ActiveCfg = Release|x8629 {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x86.Build.0 = Release|x8630 18 {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 31 19 {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|Any CPU.Build.0 = Debug|Any CPU 32 {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|x64.ActiveCfg = Debug|Any CPU33 {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|x86.ActiveCfg = Debug|Any CPU34 20 {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|Any CPU.ActiveCfg = Release|Any CPU 35 21 {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|Any CPU.Build.0 = Release|Any CPU 36 {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|x64.ActiveCfg = Release|Any CPU37 {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|x86.ActiveCfg = Release|Any CPU38 22 EndGlobalSection 39 23 GlobalSection(SolutionProperties) = preSolution -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.Designer.cs
r7312 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 components = new System.ComponentModel.Container(); 47 this.assignmentTreeView = new System.Windows.Forms.TreeView(); 48 this.label1 = new System.Windows.Forms.Label(); 49 this.qualityTextBox = new System.Windows.Forms.TextBox(); 50 this.label2 = new System.Windows.Forms.Label(); 51 this.SuspendLayout(); 52 // 53 // assignmentTreeView 54 // 55 this.assignmentTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 56 | System.Windows.Forms.AnchorStyles.Left) 57 | System.Windows.Forms.AnchorStyles.Right))); 58 this.assignmentTreeView.Location = new System.Drawing.Point(3, 52); 59 this.assignmentTreeView.Name = "assignmentTreeView"; 60 this.assignmentTreeView.Size = new System.Drawing.Size(349, 329); 61 this.assignmentTreeView.TabIndex = 0; 62 // 63 // label1 64 // 65 this.label1.AutoSize = true; 66 this.label1.Location = new System.Drawing.Point(3, 7); 67 this.label1.Name = "label1"; 68 this.label1.Size = new System.Drawing.Size(42, 13); 69 this.label1.TabIndex = 1; 70 this.label1.Text = "Quality:"; 71 // 72 // qualityTextBox 73 // 74 this.qualityTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 75 | System.Windows.Forms.AnchorStyles.Right))); 76 this.qualityTextBox.Location = new System.Drawing.Point(51, 4); 77 this.qualityTextBox.Name = "qualityTextBox"; 78 this.qualityTextBox.Size = new System.Drawing.Size(301, 20); 79 this.qualityTextBox.TabIndex = 2; 80 // 81 // label2 82 // 83 this.label2.AutoSize = true; 84 this.label2.Location = new System.Drawing.Point(3, 36); 85 this.label2.Name = "label2"; 86 this.label2.Size = new System.Drawing.Size(64, 13); 87 this.label2.TabIndex = 1; 88 this.label2.Text = "Assignment:"; 89 // 90 // GQAPAssignmentView 91 // 92 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 48 93 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 94 this.Controls.Add(this.qualityTextBox); 95 this.Controls.Add(this.label2); 96 this.Controls.Add(this.label1); 97 this.Controls.Add(this.assignmentTreeView); 98 this.Name = "GQAPAssignmentView"; 99 this.Size = new System.Drawing.Size(355, 384); 100 this.ResumeLayout(false); 101 this.PerformLayout(); 102 49 103 } 50 104 51 105 #endregion 106 107 private System.Windows.Forms.TreeView assignmentTreeView; 108 private System.Windows.Forms.Label label1; 109 private System.Windows.Forms.TextBox qualityTextBox; 110 private System.Windows.Forms.Label label2; 52 111 } 53 112 } -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs
r7312 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 23 25 using System.Windows.Forms; 24 26 using HeuristicLab.Core.Views; 27 using HeuristicLab.Encodings.IntegerVectorEncoding; 25 28 using HeuristicLab.MainForm; 26 29 using HeuristicLab.MainForm.WindowsForms; … … 52 55 protected override void OnContentChanged() { 53 56 base.OnContentChanged(); 57 assignmentTreeView.Nodes.Clear(); 54 58 if (Content == null) { 55 // TODO: Put code here when content is null59 qualityTextBox.Text = String.Empty; 56 60 } else { 57 // TODO: Put code here when content has been changed and is not null 61 qualityTextBox.Text = Content.Quality.Value.ToString(); 62 BuildAssignmentTree(); 58 63 } 59 64 } … … 61 66 protected override void SetEnabledStateOfControls() { 62 67 base.SetEnabledStateOfControls(); 63 // TODO: Put code here to enable or disable controls based on whether the Content is/not null or the view is ReadOnly 68 qualityTextBox.Enabled = !ReadOnly && !Locked && Content != null; 69 assignmentTreeView.Enabled = !ReadOnly && !Locked && Content != null; 64 70 } 65 71 … … 67 73 // TODO: Put event handlers here 68 74 #endregion 75 76 private void BuildAssignmentTree() { 77 IntegerVector assignment = Content.Assignment; 78 Dictionary<int, TreeNode> locationNodes = new Dictionary<int, TreeNode>(); 79 for (int i = 0; i < assignment.Length; i++) { 80 if (!locationNodes.ContainsKey(assignment[i])) { 81 string locationName = assignment[i].ToString(); 82 if (Content.LocationNames != null && Content.LocationNames.Length > 0) 83 locationName = Content.LocationNames[assignment[i] % Content.LocationNames.Length]; 84 locationNodes.Add(assignment[i], new TreeNode(locationName)); 85 } 86 string equipmentName = i.ToString(); 87 if (Content.EquipmentNames != null && Content.EquipmentNames.Length > 0) 88 equipmentName = Content.EquipmentNames[i % Content.EquipmentNames.Length]; 89 locationNodes[assignment[i]].Nodes.Add(equipmentName); 90 } 91 92 assignmentTreeView.BeginUpdate(); 93 try { 94 foreach (var node in locationNodes.OrderBy(x => x.Key).Select(x => x.Value)) { 95 assignmentTreeView.Nodes.Add(node); 96 node.Expand(); 97 } 98 } finally { assignmentTreeView.EndUpdate(); } 99 } 69 100 } 70 101 } -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj
r7312 r7319 38 38 </PropertyGroup> 39 39 <ItemGroup> 40 <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" /> 41 <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" /> 42 <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" /> 40 <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 41 <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 42 <Reference Include="HeuristicLab.Core-3.3"> 43 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath> 44 </Reference> 45 <Reference Include="HeuristicLab.Core.Views-3.3"> 46 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath> 47 </Reference> 48 <Reference Include="HeuristicLab.Data-3.3"> 49 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath> 50 </Reference> 51 <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 52 <Reference Include="HeuristicLab.MainForm-3.3"> 53 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath> 54 </Reference> 55 <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3"> 56 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath> 57 </Reference> 58 <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 59 <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 60 <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 61 <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 43 62 <Reference Include="System" /> 44 63 <Reference Include="System.Core" /> … … 72 91 </ProjectReference> 73 92 </ItemGroup> 93 <ItemGroup> 94 <EmbeddedResource Include="GQAPAssignmentView.resx"> 95 <DependentUpon>GQAPAssignmentView.cs</DependentUpon> 96 </EmbeddedResource> 97 </ItemGroup> 74 98 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 75 99 <PropertyGroup> … … 79 103 set Outdir=$(Outdir) 80 104 81 call PreBuildEvent.cmd 82 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent> 105 call PreBuildEvent.cmd</PreBuildEvent> 83 106 </PropertyGroup> 84 107 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/Plugin.cs.frame
r7312 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 30 30 [PluginDependency("HeuristicLab.Core", "3.3")] 31 [PluginDependency("HeuristicLab.Core.Views", "3.3")] 31 32 [PluginDependency("HeuristicLab.Data", "3.3")] 32 33 [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")] 34 [PluginDependency("HeuristicLab.MainForm", "3.3")] 35 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 33 36 [PluginDependency("HeuristicLab.Operators", "3.3")] 34 37 [PluginDependency("HeuristicLab.Optimization", "3.3")] 35 38 [PluginDependency("HeuristicLab.Parameters", "3.3")] 36 [PluginDependency("HeuristicLab.P ersistence", "3.3")]39 [PluginDependency("HeuristicLab.Problems.GeneralizedQuadraticAssignment", "3.3")] 37 40 public class HeuristicLabProblemsGeneralizedQuadraticAssignmentViewsPlugin : PluginBase { 38 41 } -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs
r7311 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPEvaluator.cs
r7311 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs
r7311 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs
r7311 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 146 146 Capacities[0] = 4; Capacities[1] = 1; Capacities[2] = 4; 147 147 148 SolutionCreator.IntegerVectorParameter.ActualName = "Assignment"; 148 149 Parameterize(); 149 150 … … 200 201 private void InitializeOperators() { 201 202 Operators.AddRange(ApplicationManager.Manager.GetInstances<IIntegerVectorOperator>()); 203 Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPOperator>()); 202 204 Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator); 203 205 Operators.Add(new BestGQAPSolutionAnalyzer()); … … 212 214 Evaluator.DemandsParameter.ActualName = DemandsParameter.Name; 213 215 Evaluator.CapacitiesParameter.ActualName = CapacitiesParameter.Name; 214 Evaluator.AssignmentParameter.ActualName = "Assignment";216 Evaluator.AssignmentParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName; 215 217 216 218 SolutionCreator.LengthParameter.Value = new IntValue(Demands.Length); 217 219 SolutionCreator.MinimumParameter.Value = new IntValue(0); 218 220 SolutionCreator.MaximumParameter.Value = new IntValue(Capacities.Length); 219 SolutionCreator.IntegerVectorParameter.ActualName = "Assignment"; 220 221 foreach (IIntegerVectorCrossover op in Operators.OfType<IIntegerVectorCrossover>()) { 221 222 foreach (var op in Operators.OfType<IIntegerVectorCrossover>()) { 222 223 op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName; 223 224 op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName; 224 225 } 225 foreach ( IIntegerVectorManipulator op in Operators.OfType<IIntegerVectorManipulator>()) {226 foreach (var op in Operators.OfType<IIntegerVectorManipulator>()) { 226 227 op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName; 228 } 229 foreach (var op in Operators.OfType<IGQAPCrossover>()) { 230 op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName; 231 op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName; 232 } 233 foreach (var op in Operators.OfType<IGQAPManipulator>()) { 234 op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName; 235 } 236 foreach (var op in Operators.OfType<ILocationAwareGQAPOperator>()) { 237 op.CapacitiesParameter.ActualName = CapacitiesParameter.Name; 238 } 239 foreach (var op in Operators.OfType<IEquipmentAwareGQAPManipulator>()) { 240 op.DemandsParameter.ActualName = DemandsParameter.Name; 227 241 } 228 242 -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj
r6956 r7319 36 36 <PropertyGroup> 37 37 <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile> 38 </PropertyGroup>39 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">40 <DebugSymbols>true</DebugSymbols>41 <OutputPath>bin\x86\Debug\</OutputPath>42 <DefineConstants>DEBUG;TRACE</DefineConstants>43 <DebugType>full</DebugType>44 <PlatformTarget>x86</PlatformTarget>45 <CodeAnalysisLogFile>bin\Debug\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>46 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>47 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>48 <ErrorReport>prompt</ErrorReport>49 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>50 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>51 <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>52 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>53 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>54 </PropertyGroup>55 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">56 <OutputPath>bin\x86\Release\</OutputPath>57 <DefineConstants>TRACE</DefineConstants>58 <Optimize>true</Optimize>59 <DebugType>pdbonly</DebugType>60 <PlatformTarget>x86</PlatformTarget>61 <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>62 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>63 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>64 <ErrorReport>prompt</ErrorReport>65 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>66 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>67 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>68 <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>69 </PropertyGroup>70 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">71 <DebugSymbols>true</DebugSymbols>72 <OutputPath>bin\x64\Debug\</OutputPath>73 <DefineConstants>DEBUG;TRACE</DefineConstants>74 <DebugType>full</DebugType>75 <PlatformTarget>x64</PlatformTarget>76 <CodeAnalysisLogFile>bin\Debug\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>77 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>78 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>79 <ErrorReport>prompt</ErrorReport>80 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>81 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>82 <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>83 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>84 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>85 </PropertyGroup>86 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">87 <OutputPath>bin\x64\Release\</OutputPath>88 <DefineConstants>TRACE</DefineConstants>89 <Optimize>true</Optimize>90 <DebugType>pdbonly</DebugType>91 <PlatformTarget>x64</PlatformTarget>92 <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>93 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>94 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>95 <ErrorReport>prompt</ErrorReport>96 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>97 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>98 <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>99 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>100 <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>101 <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>102 38 </PropertyGroup> 103 39 <ItemGroup> … … 153 89 <ItemGroup> 154 90 <Compile Include="Analyzers\BestGQAPSolutionAnalyzer.cs" /> 91 <Compile Include="ExtensionMethods.cs" /> 155 92 <Compile Include="GQAPAssignment.cs" /> 156 93 <None Include="Plugin.cs.frame" /> 157 94 <Compile Include="Evaluators\GQAPEvaluator.cs" /> 158 95 <Compile Include="GeneralizedQuadraticAssignmentProblem.cs" /> 96 <Compile Include="Interfaces\IEquipmentAwareGQAPOperator.cs" /> 97 <Compile Include="Interfaces\IGQAPCrossover.cs" /> 159 98 <Compile Include="Interfaces\IGQAPEvaluator.cs" /> 99 <Compile Include="Interfaces\IGQAPManipulator.cs" /> 100 <Compile Include="Interfaces\IGQAPOperator.cs" /> 101 <Compile Include="Interfaces\ILocationAwareGQAPOperator.cs" /> 102 <Compile Include="Operators\DemandEquivalentSwapEquipmentManipluator.cs" /> 103 <Compile Include="Operators\GQAPCrossover.cs" /> 104 <Compile Include="Operators\DiscreteLocationCrossover.cs" /> 105 <Compile Include="Operators\RelocateEquipmentManipluator.cs" /> 106 <Compile Include="Operators\GQAPManipulator.cs" /> 107 <Compile Include="Operators\SwapEquipmentManipluator.cs" /> 108 <Compile Include="Operators\SwapLocationManipulator.cs" /> 160 109 <Compile Include="Plugin.cs" /> 161 110 <Compile Include="Properties\AssemblyInfo.cs" /> 162 <None Include="Properties\AssemblyInfo. frame" />111 <None Include="Properties\AssemblyInfo.cs.frame" /> 163 112 </ItemGroup> 164 113 <ItemGroup> … … 172 121 set Outdir=$(Outdir) 173 122 174 call PreBuildEvent.cmd 175 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent> 123 call PreBuildEvent.cmd</PreBuildEvent> 176 124 </PropertyGroup> 177 125 <PropertyGroup> -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPEvaluator.cs
r6956 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Plugin.cs.frame
r6956 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Properties/AssemblyInfo.cs.frame
r6956 r7319 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.
