Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5932


Ignore:
Timestamp:
04/02/11 22:16:52 (14 years ago)
Author:
abeham
Message:

#1330

  • Finished further changes from review
Location:
branches/QAP
Files:
3 added
3 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • branches/QAP/HeuristicLab.Analysis/3.3/MultidimensionalScaling/MultidimensionalScaling.cs

    r5931 r5932  
    6868    /// In every iteration it tries to find the best location for every item.</param>
    6969    /// <returns>A Nx2 matrix where the first column represents the x- and the second column the y coordinates.</returns>
    70     public static DoubleMatrix KruskalShepard(DoubleMatrix dissimilarities, DoubleMatrix coordinates, int maximumIterations = 100) {
     70    public static DoubleMatrix KruskalShepard(DoubleMatrix dissimilarities, DoubleMatrix coordinates, int maximumIterations = 20) {
    7171      int dimension = dissimilarities.Rows;
    7272      if (dimension != dissimilarities.Columns || coordinates.Rows != dimension) throw new ArgumentException("The number of coordinates and the number of rows and columns in the dissimilarities matrix do not match.");

  • branches/QAP/HeuristicLab.Analysis/3.3/Tests/MultidimensionalScalingTest.cs

    r5873 r5932  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using HeuristicLab.Data;
    324using Microsoft.VisualStudio.TestTools.UnitTesting;

  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj

    r5873 r5932  
    143143      <DependentUpon>QAPAssignmentView.cs</DependentUpon>
    144144    </Compile>
    145     <Compile Include="QAPView.cs">
     145    <Compile Include="QAPVisualizationControl.cs">
    146146      <SubType>UserControl</SubType>
    147147    </Compile>
    148     <Compile Include="QAPView.Designer.cs">
    149       <DependentUpon>QAPView.cs</DependentUpon>
     148    <Compile Include="QAPVisualizationControl.Designer.cs">
     149      <DependentUpon>QAPVisualizationControl.cs</DependentUpon>
    150150    </Compile>
    151151    <Compile Include="QuadraticAssignmentProblemView.cs">
    … …  
    167167      <DependentUpon>QAPAssignmentView.cs</DependentUpon>
    168168    </EmbeddedResource>
    169     <EmbeddedResource Include="QAPView.resx">
    170       <DependentUpon>QAPView.cs</DependentUpon>
     169    <EmbeddedResource Include="QAPVisualizationControl.resx">
     170      <DependentUpon>QAPVisualizationControl.cs</DependentUpon>
    171171    </EmbeddedResource>
    172172    <EmbeddedResource Include="QuadraticAssignmentProblemView.resx">

  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPAssignmentView.Designer.cs

    r5648 r5932  
    5353      this.assignmentGroupBox = new System.Windows.Forms.GroupBox();
    5454      this.assignmentViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    55       this.qapView = new HeuristicLab.Problems.QuadraticAssignment.Views.QAPView();
     55      this.qapView = new HeuristicLab.Problems.QuadraticAssignment.Views.QAPVisualizationControl();
    5656      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    5757      this.splitContainer.Panel1.SuspendLayout();
    … …  
    220220    private System.Windows.Forms.GroupBox assignmentGroupBox;
    221221    private MainForm.WindowsForms.ViewHost assignmentViewHost;
    222     private QAPView qapView;
     222    private QAPVisualizationControl qapView;
    223223  }
    224224}

  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.Designer.cs

    r5931 r5932  
    5353      this.problemTabPage = new System.Windows.Forms.TabPage();
    5454      this.visualizationTabPage = new System.Windows.Forms.TabPage();
    55       this.qapView = new HeuristicLab.Problems.QuadraticAssignment.Views.QAPView();
     55      this.qapView = new HeuristicLab.Problems.QuadraticAssignment.Views.QAPVisualizationControl();
    5656      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5757      this.tabControl.SuspendLayout();
    … …  
    218218    private System.Windows.Forms.TabPage problemTabPage;
    219219    private System.Windows.Forms.TabPage visualizationTabPage;
    220     private QAPView qapView;
     220    private QAPVisualizationControl qapView;
    221221  }
    222222}

  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/QAPAssignment.cs

    r5838 r5932  
    1 using System.ComponentModel;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System.ComponentModel;
    223using HeuristicLab.Common;
    324using HeuristicLab.Core;

  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Tests/QAPLIBInstancesTest.cs

    r5838 r5932  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Text;
    324using HeuristicLab.Common;
Note: See TracChangeset for help on using the changeset viewer.