Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/25/12 18:32:44 (12 years ago)
Author:
abeham
Message:

#1614: worked on GQAP and GRASP+PR

Location:
branches/GeneralizedQAP
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/GeneralizedQAP

    • Property svn:ignore

      •  

        old new  
        11*.suo
         2TestResults

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3

    • Property svn:ignore

      •  

        old new  
        22bin
        33obj
         4*.user

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.Designer.cs

    r7319 r7412  
    5656                  | System.Windows.Forms.AnchorStyles.Left)
    5757                  | System.Windows.Forms.AnchorStyles.Right)));
    58       this.assignmentTreeView.Location = new System.Drawing.Point(3, 52);
     58      this.assignmentTreeView.Location = new System.Drawing.Point(3, 50);
     59      this.assignmentTreeView.Margin = new System.Windows.Forms.Padding(3, 6, 3, 3);
    5960      this.assignmentTreeView.Name = "assignmentTreeView";
    60       this.assignmentTreeView.Size = new System.Drawing.Size(349, 329);
    61       this.assignmentTreeView.TabIndex = 0;
     61      this.assignmentTreeView.Size = new System.Drawing.Size(349, 331);
     62      this.assignmentTreeView.TabIndex = 3;
    6263      //
    6364      // label1
    … …  
    6768      this.label1.Name = "label1";
    6869      this.label1.Size = new System.Drawing.Size(42, 13);
    69       this.label1.TabIndex = 1;
     70      this.label1.TabIndex = 0;
    7071      this.label1.Text = "Quality:";
    7172      //
    … …  
    7778      this.qualityTextBox.Name = "qualityTextBox";
    7879      this.qualityTextBox.Size = new System.Drawing.Size(301, 20);
    79       this.qualityTextBox.TabIndex = 2;
     80      this.qualityTextBox.TabIndex = 1;
    8081      //
    8182      // label2
    8283      //
    8384      this.label2.AutoSize = true;
    84       this.label2.Location = new System.Drawing.Point(3, 36);
     85      this.label2.Location = new System.Drawing.Point(3, 31);
    8586      this.label2.Name = "label2";
    8687      this.label2.Size = new System.Drawing.Size(64, 13);
    87       this.label2.TabIndex = 1;
     88      this.label2.TabIndex = 2;
    8889      this.label2.Text = "Assignment:";
    8990      //

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs

    r7319 r7412  
    6666    protected override void SetEnabledStateOfControls() {
    6767      base.SetEnabledStateOfControls();
    68       qualityTextBox.Enabled = !ReadOnly && !Locked && Content != null;
    69       assignmentTreeView.Enabled = !ReadOnly && !Locked && Content != null;
     68      qualityTextBox.Enabled = false;
     69      assignmentTreeView.Enabled = true;
    7070    }
    7171

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj

    r7319 r7412  
    3838  </PropertyGroup>
    3939  <ItemGroup>
    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" />
     40    <Reference Include="HeuristicLab.Common-3.3">
     41      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     42    </Reference>
     43    <Reference Include="HeuristicLab.Common.Resources-3.3">
     44      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3-3.3.dll</HintPath>
     45    </Reference>
    4246    <Reference Include="HeuristicLab.Core-3.3">
    4347      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    … …  
    4953      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    5054    </Reference>
    51     <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     55    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3">
     56      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.IntegerVectorEncoding-3.3.dll</HintPath>
     57    </Reference>
    5258    <Reference Include="HeuristicLab.MainForm-3.3">
    5359      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    … …  
    5662      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    5763    </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" />
     64    <Reference Include="HeuristicLab.Operators-3.3">
     65      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     66    </Reference>
     67    <Reference Include="HeuristicLab.Optimization-3.3">
     68      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     69    </Reference>
     70    <Reference Include="HeuristicLab.Parameters-3.3">
     71      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     72    </Reference>
     73    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     74      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     75    </Reference>
    6276    <Reference Include="System" />
    6377    <Reference Include="System.Core" />
Note: See TracChangeset for help on using the changeset viewer.