Changeset 7319


Ignore:
Timestamp:
01/11/12 17:47:04 (8 years ago)
Author:
abeham
Message:

#1614: worked on GQAP (added operators, assignment view)

Location:
branches/GeneralizedQAP
Files:
16 added
14 edited

Legend:

Unmodified
Added
Removed
  • branches/GeneralizedQAP/Build.cmd

    r6956 r7319  
    11@ECHO OFF
    22
    3 SET CLEANBEFOREBUILD=1
     3SET CLEANBEFOREBUILD=0
    44
    55SET SELECTED=
     
    4949
    5050:prompt_config
    51 SET /P CONFIGURATION=Which configuration to build [Debug]:
    52 IF "%CONFIGURATION%"=="" SET CONFIGURATION=Debug
     51SET /P CONFIGURATION=Which configuration to build [Release]:
     52IF "%CONFIGURATION%"=="" SET CONFIGURATION=Release
    5353
    5454:platform_selection
     
    7777)
    7878ECHO Building ...
    79 %MSBUILDPATH%msbuild.exe %SELECTED% /target:Build /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly
     79%MSBUILDPATH%msbuild.exe %SELECTED% /target:Rebuild /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly
    8080
    8181ECHO.
  • branches/GeneralizedQAP/GeneralizedQAP.sln

    r7312 r7319  
    99  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1010    Debug|Any CPU = Debug|Any CPU
    11     Debug|x64 = Debug|x64
    12     Debug|x86 = Debug|x86
    1311    Release|Any CPU = Release|Any CPU
    14     Release|x64 = Release|x64
    15     Release|x86 = Release|x86
    1612  EndGlobalSection
    1713  GlobalSection(ProjectConfigurationPlatforms) = postSolution
    1814    {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1915    {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|Any CPU.Build.0 = Debug|Any CPU
    20     {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x64.ActiveCfg = Debug|x64
    21     {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x64.Build.0 = Debug|x64
    22     {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x86.ActiveCfg = Debug|x86
    23     {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x86.Build.0 = Debug|x86
    2416    {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2517    {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|Any CPU.Build.0 = Release|Any CPU
    26     {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x64.ActiveCfg = Release|x64
    27     {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x64.Build.0 = Release|x64
    28     {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x86.ActiveCfg = Release|x86
    29     {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x86.Build.0 = Release|x86
    3018    {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    3119    {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|Any CPU.Build.0 = Debug|Any CPU
    32     {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|x64.ActiveCfg = Debug|Any CPU
    33     {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|x86.ActiveCfg = Debug|Any CPU
    3420    {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|Any CPU.ActiveCfg = Release|Any CPU
    3521    {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|Any CPU.Build.0 = Release|Any CPU
    36     {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|x64.ActiveCfg = Release|Any CPU
    37     {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|x86.ActiveCfg = Release|Any CPU
    3822  EndGlobalSection
    3923  GlobalSection(SolutionProperties) = preSolution
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.Designer.cs

    r7312 r7319  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    4545    /// </summary>
    4646    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);
    4893      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
    49103    }
    50104
    51105    #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;
    52111  }
    53112}
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs

    r7312 r7319  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2121
    2222using System;
     23using System.Collections.Generic;
     24using System.Linq;
    2325using System.Windows.Forms;
    2426using HeuristicLab.Core.Views;
     27using HeuristicLab.Encodings.IntegerVectorEncoding;
    2528using HeuristicLab.MainForm;
    2629using HeuristicLab.MainForm.WindowsForms;
     
    5255    protected override void OnContentChanged() {
    5356      base.OnContentChanged();
     57      assignmentTreeView.Nodes.Clear();
    5458      if (Content == null) {
    55         // TODO: Put code here when content is null
     59        qualityTextBox.Text = String.Empty;
    5660      } else {
    57         // TODO: Put code here when content has been changed and is not null
     61        qualityTextBox.Text = Content.Quality.Value.ToString();
     62        BuildAssignmentTree();
    5863      }
    5964    }
     
    6166    protected override void SetEnabledStateOfControls() {
    6267      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;
    6470    }
    6571
     
    6773    // TODO: Put event handlers here
    6874    #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    }
    69100  }
    70101}
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj

    r7312 r7319  
    3838  </PropertyGroup>
    3939  <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" />
    4362    <Reference Include="System" />
    4463    <Reference Include="System.Core" />
     
    7291    </ProjectReference>
    7392  </ItemGroup>
     93  <ItemGroup>
     94    <EmbeddedResource Include="GQAPAssignmentView.resx">
     95      <DependentUpon>GQAPAssignmentView.cs</DependentUpon>
     96    </EmbeddedResource>
     97  </ItemGroup>
    7498  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    7599  <PropertyGroup>
     
    79103set Outdir=$(Outdir)
    80104
    81 call PreBuildEvent.cmd
    82 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent>
     105call PreBuildEvent.cmd</PreBuildEvent>
    83106  </PropertyGroup>
    84107  <!-- 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  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2929  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3030  [PluginDependency("HeuristicLab.Core", "3.3")]
     31  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    3132  [PluginDependency("HeuristicLab.Data", "3.3")]
    3233  [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
     34  [PluginDependency("HeuristicLab.MainForm", "3.3")]
     35  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    3336  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3437  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3538  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    36   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     39  [PluginDependency("HeuristicLab.Problems.GeneralizedQuadraticAssignment", "3.3")]
    3740  public class HeuristicLabProblemsGeneralizedQuadraticAssignmentViewsPlugin : PluginBase {
    3841  }
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs

    r7311 r7319  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPEvaluator.cs

    r7311 r7319  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs

    r7311 r7319  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

    r7311 r7319  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    146146      Capacities[0] = 4; Capacities[1] = 1; Capacities[2] = 4;
    147147
     148      SolutionCreator.IntegerVectorParameter.ActualName = "Assignment";
    148149      Parameterize();
    149150
     
    200201    private void InitializeOperators() {
    201202      Operators.AddRange(ApplicationManager.Manager.GetInstances<IIntegerVectorOperator>());
     203      Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPOperator>());
    202204      Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
    203205      Operators.Add(new BestGQAPSolutionAnalyzer());
     
    212214      Evaluator.DemandsParameter.ActualName = DemandsParameter.Name;
    213215      Evaluator.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
    214       Evaluator.AssignmentParameter.ActualName = "Assignment";
     216      Evaluator.AssignmentParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
    215217
    216218      SolutionCreator.LengthParameter.Value = new IntValue(Demands.Length);
    217219      SolutionCreator.MinimumParameter.Value = new IntValue(0);
    218220      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>()) {
    222223        op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
    223224        op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
    224225      }
    225       foreach (IIntegerVectorManipulator op in Operators.OfType<IIntegerVectorManipulator>()) {
     226      foreach (var op in Operators.OfType<IIntegerVectorManipulator>()) {
    226227        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;
    227241      }
    228242
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj

    r6956 r7319  
    3636  <PropertyGroup>
    3737    <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>
    10238  </PropertyGroup>
    10339  <ItemGroup>
     
    15389  <ItemGroup>
    15490    <Compile Include="Analyzers\BestGQAPSolutionAnalyzer.cs" />
     91    <Compile Include="ExtensionMethods.cs" />
    15592    <Compile Include="GQAPAssignment.cs" />
    15693    <None Include="Plugin.cs.frame" />
    15794    <Compile Include="Evaluators\GQAPEvaluator.cs" />
    15895    <Compile Include="GeneralizedQuadraticAssignmentProblem.cs" />
     96    <Compile Include="Interfaces\IEquipmentAwareGQAPOperator.cs" />
     97    <Compile Include="Interfaces\IGQAPCrossover.cs" />
    15998    <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" />
    160109    <Compile Include="Plugin.cs" />
    161110    <Compile Include="Properties\AssemblyInfo.cs" />
    162     <None Include="Properties\AssemblyInfo.frame" />
     111    <None Include="Properties\AssemblyInfo.cs.frame" />
    163112  </ItemGroup>
    164113  <ItemGroup>
     
    172121set Outdir=$(Outdir)
    173122
    174 call PreBuildEvent.cmd
    175 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent>
     123call PreBuildEvent.cmd</PreBuildEvent>
    176124  </PropertyGroup>
    177125  <PropertyGroup>
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPEvaluator.cs

    r6956 r7319  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Plugin.cs.frame

    r6956 r7319  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Properties/AssemblyInfo.cs.frame

    r6956 r7319  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.