Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6659 for branches


Ignore:
Timestamp:
08/12/11 23:30:19 (13 years ago)
Author:
abeham
Message:

#1619

  • experimented with a first locally working version
Location:
branches/GeneralizedQAP
Files:
40 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/GeneralizedQAP/HeuristicLab 3.3 Services.sln

    r5163 r6659  
    1717Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Deployment-3.3.Tests", "HeuristicLab.Services.Deployment\3.3\Tests\HeuristicLab.Services.Deployment-3.3.Tests.csproj", "{421D9CCA-5A48-4813-AB9C-ED7025F9CC35}"
    1818EndProject
     19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.ProblemInstances-3.3", "HeuristicLab.Services.ProblemInstances\HeuristicLab.Services.ProblemInstances-3.3.csproj", "{D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}"
     20EndProject
     21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.ProblemInstances.QAPInitializer", "HeuristicLab.Services.ProblemInstances.QAPInitializer\HeuristicLab.Services.ProblemInstances.QAPInitializer.csproj", "{BA6B5487-6CCA-4484-B196-13B68A45CBB5}"
     22  ProjectSection(ProjectDependencies) = postProject
     23    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898} = {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}
     24  EndProjectSection
     25EndProject
    1926Global
    2027  GlobalSection(TestCaseManagementSettings) = postSolution
    … …  
    2330  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    2431    Debug|Any CPU = Debug|Any CPU
     32    Debug|Mixed Platforms = Debug|Mixed Platforms
    2533    Debug|x64 = Debug|x64
    2634    Debug|x86 = Debug|x86
    2735    Release|Any CPU = Release|Any CPU
     36    Release|Mixed Platforms = Release|Mixed Platforms
    2837    Release|x64 = Release|x64
    2938    Release|x86 = Release|x86
    … …  
    3241    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    3342    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
     43    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     44    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Debug|Mixed Platforms.Build.0 = Debug|x64
    3445    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Debug|x64.ActiveCfg = Debug|x64
    3546    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Debug|x64.Build.0 = Debug|x64
    … …  
    3849    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    3950    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Release|Any CPU.Build.0 = Release|Any CPU
     51    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Release|Mixed Platforms.ActiveCfg = Release|x64
     52    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Release|Mixed Platforms.Build.0 = Release|x64
    4053    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Release|x64.ActiveCfg = Release|x64
    4154    {30D8C5F1-CD3A-4EC1-907F-430177A03FBE}.Release|x64.Build.0 = Release|x64
    … …  
    4457    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    4558    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Debug|Any CPU.Build.0 = Debug|Any CPU
     59    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     60    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Debug|Mixed Platforms.Build.0 = Debug|x64
    4661    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Debug|x64.ActiveCfg = Debug|x64
    4762    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Debug|x64.Build.0 = Debug|x64
    … …  
    5065    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Release|Any CPU.ActiveCfg = Release|Any CPU
    5166    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Release|Any CPU.Build.0 = Release|Any CPU
     67    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Release|Mixed Platforms.ActiveCfg = Release|x64
     68    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Release|Mixed Platforms.Build.0 = Release|x64
    5269    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Release|x64.ActiveCfg = Release|x64
    5370    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Release|x64.Build.0 = Release|x64
    … …  
    5673    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    5774    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Debug|Any CPU.Build.0 = Debug|Any CPU
     75    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     76    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Debug|Mixed Platforms.Build.0 = Debug|x86
    5877    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Debug|x64.ActiveCfg = Debug|x64
    5978    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Debug|x64.Build.0 = Debug|x64
    … …  
    6281    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Release|Any CPU.ActiveCfg = Release|Any CPU
    6382    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Release|Any CPU.Build.0 = Release|Any CPU
     83    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Release|Mixed Platforms.ActiveCfg = Release|x86
     84    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Release|Mixed Platforms.Build.0 = Release|x86
    6485    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Release|x64.ActiveCfg = Release|x64
    6586    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Release|x64.Build.0 = Release|x64
    6687    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Release|x86.ActiveCfg = Release|x86
    6788    {421D9CCA-5A48-4813-AB9C-ED7025F9CC35}.Release|x86.Build.0 = Release|x86
     89    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     90    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Debug|Any CPU.Build.0 = Debug|Any CPU
     91    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     92    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     93    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Debug|x64.ActiveCfg = Debug|Any CPU
     94    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Debug|x86.ActiveCfg = Debug|Any CPU
     95    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Release|Any CPU.ActiveCfg = Release|Any CPU
     96    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Release|Any CPU.Build.0 = Release|Any CPU
     97    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     98    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     99    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Release|x64.ActiveCfg = Release|Any CPU
     100    {D4E9242F-DAA4-4A15-8DE7-91CECFFFD898}.Release|x86.ActiveCfg = Release|Any CPU
     101    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Debug|Any CPU.ActiveCfg = Debug|x86
     102    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     103    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Debug|Mixed Platforms.Build.0 = Debug|x86
     104    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Debug|x64.ActiveCfg = Debug|x86
     105    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Debug|x86.ActiveCfg = Debug|x86
     106    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Debug|x86.Build.0 = Debug|x86
     107    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Release|Any CPU.ActiveCfg = Release|x86
     108    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Release|Mixed Platforms.ActiveCfg = Release|x86
     109    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Release|Mixed Platforms.Build.0 = Release|x86
     110    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Release|x64.ActiveCfg = Release|x86
     111    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Release|x86.ActiveCfg = Release|x86
     112    {BA6B5487-6CCA-4484-B196-13B68A45CBB5}.Release|x86.Build.0 = Release|x86
    68113  EndGlobalSection
    69114  GlobalSection(SolutionProperties) = preSolution

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

    r6657 r6659  
    7878      set { InstallationCostsParameter.Value = value; }
    7979    }
    80     public DoubleValue TransportationCosts {
    81       get { return TransportationCostsParameter.Value; }
    82       set { TransportationCostsParameter.Value = value; }
     80    public double TransportationCosts {
     81      get { return TransportationCostsParameter.Value.Value; }
     82      set { TransportationCostsParameter.Value.Value = value; }
    8383    }
    8484    public DoubleArray Demands {
    … …  
    131131      InstallationCosts = new DoubleMatrix(3, 3);
    132132
    133       TransportationCosts = new DoubleValue(1);
     133      TransportationCosts = 1;
    134134
    135135      Demands = new DoubleArray(5);

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

    r6344 r6659  
    113113    <Reference Include="System.Data" />
    114114    <Reference Include="System.Drawing" />
     115    <Reference Include="System.Runtime.Serialization" />
     116    <Reference Include="System.ServiceModel" />
    115117    <Reference Include="System.Windows.Forms" />
    116118    <Reference Include="System.Windows.Forms.DataVisualization" />
    … …  
    136138      <DependentUpon>QuadraticAssignmentProblemView.cs</DependentUpon>
    137139    </Compile>
     140    <Compile Include="Service References\QAPServiceReference\Reference.cs">
     141      <AutoGen>True</AutoGen>
     142      <DesignTime>True</DesignTime>
     143      <DependentUpon>Reference.svcmap</DependentUpon>
     144    </Compile>
     145    <None Include="app.config" />
    138146    <None Include="Plugin.cs.frame" />
    139147    <Compile Include="Plugin.cs" />
    140148    <Compile Include="Properties\AssemblyInfo.cs" />
    141149    <None Include="Properties\AssemblyInfo.frame" />
     150    <None Include="Service References\QAPServiceReference\HeuristicLab.Problems.QuadraticAssignment.Views.QAPServiceReference.QAPInstanceDto.datasource">
     151      <DependentUpon>Reference.svcmap</DependentUpon>
     152    </None>
     153    <None Include="Service References\QAPServiceReference\HeuristicLab.Problems.QuadraticAssignment.Views.QAPServiceReference.QAPSolutionDto.datasource">
     154      <DependentUpon>Reference.svcmap</DependentUpon>
     155    </None>
     156    <None Include="Service References\QAPServiceReference\QAP.wsdl" />
     157    <None Include="Service References\QAPServiceReference\QAP.xsd">
     158      <SubType>Designer</SubType>
     159    </None>
     160    <None Include="Service References\QAPServiceReference\QAP1.xsd">
     161      <SubType>Designer</SubType>
     162    </None>
     163    <None Include="Service References\QAPServiceReference\QAP2.xsd">
     164      <SubType>Designer</SubType>
     165    </None>
     166    <None Include="Service References\QAPServiceReference\QAP3.xsd">
     167      <SubType>Designer</SubType>
     168    </None>
    142169  </ItemGroup>
    143170  <ItemGroup>
    … …  
    197224      <Name>HeuristicLab.Problems.QuadraticAssignment-3.3</Name>
    198225    </ProjectReference>
     226  </ItemGroup>
     227  <ItemGroup>
     228    <WCFMetadata Include="Service References\" />
     229  </ItemGroup>
     230  <ItemGroup>
     231    <WCFMetadataStorage Include="Service References\QAPServiceReference\" />
     232  </ItemGroup>
     233  <ItemGroup>
     234    <None Include="Service References\QAPServiceReference\QAP.disco" />
     235  </ItemGroup>
     236  <ItemGroup>
     237    <None Include="Service References\QAPServiceReference\configuration91.svcinfo" />
     238  </ItemGroup>
     239  <ItemGroup>
     240    <None Include="Service References\QAPServiceReference\configuration.svcinfo" />
     241  </ItemGroup>
     242  <ItemGroup>
     243    <None Include="Service References\QAPServiceReference\Reference.svcmap">
     244      <Generator>WCF Proxy Generator</Generator>
     245      <LastGenOutput>Reference.cs</LastGenOutput>
     246    </None>
    199247  </ItemGroup>
    200248  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

    r6342 r6659  
    5454      this.visualizationTabPage = new System.Windows.Forms.TabPage();
    5555      this.qapView = new HeuristicLab.Problems.QuadraticAssignment.Views.QAPVisualizationControl();
     56      this.reloadInstancesButton = new System.Windows.Forms.Button();
    5657      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5758      this.tabControl.SuspendLayout();
    … …  
    120121      this.instancesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    121122      this.instancesComboBox.FormattingEnabled = true;
    122       this.instancesComboBox.Location = new System.Drawing.Point(105, 2);
     123      this.instancesComboBox.Location = new System.Drawing.Point(137, 1);
    123124      this.instancesComboBox.Name = "instancesComboBox";
    124       this.instancesComboBox.Size = new System.Drawing.Size(358, 21);
     125      this.instancesComboBox.Size = new System.Drawing.Size(326, 21);
    125126      this.instancesComboBox.TabIndex = 7;
    126127      this.instancesComboBox.SelectedValueChanged += new System.EventHandler(this.instancesComboBox_SelectedValueChanged);
    … …  
    184185      this.qapView.Weights = null;
    185186      //
     187      // reloadInstancesButton
     188      //
     189      this.reloadInstancesButton.Location = new System.Drawing.Point(105, 0);
     190      this.reloadInstancesButton.Name = "reloadInstancesButton";
     191      this.reloadInstancesButton.Size = new System.Drawing.Size(26, 23);
     192      this.reloadInstancesButton.TabIndex = 9;
     193      this.reloadInstancesButton.Text = "Reload";
     194      this.reloadInstancesButton.UseVisualStyleBackColor = true;
     195      this.reloadInstancesButton.Click += new System.EventHandler(this.reloadInstancesButton_Click);
     196      //
    186197      // QuadraticAssignmentProblemView
    187198      //
    … …  
    192203      this.Controls.Add(this.importInstanceButton);
    193204      this.Controls.Add(this.loadInstanceButton);
     205      this.Controls.Add(this.reloadInstancesButton);
    194206      this.Controls.Add(this.QAPLIBInstancesLabel);
    195207      this.Name = "QuadraticAssignmentProblemView";
    196208      this.Size = new System.Drawing.Size(647, 492);
    197209      this.Controls.SetChildIndex(this.QAPLIBInstancesLabel, 0);
     210      this.Controls.SetChildIndex(this.reloadInstancesButton, 0);
    198211      this.Controls.SetChildIndex(this.loadInstanceButton, 0);
    199212      this.Controls.SetChildIndex(this.importInstanceButton, 0);
    … …  
    223236    private System.Windows.Forms.TabPage visualizationTabPage;
    224237    private QAPVisualizationControl qapView;
     238    private System.Windows.Forms.Button reloadInstancesButton;
    225239  }
    226240}

  • branches/GeneralizedQAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.cs

    r6342 r6659  
    2525using HeuristicLab.Common.Resources;
    2626using HeuristicLab.Core.Views;
     27using HeuristicLab.Data;
    2728using HeuristicLab.MainForm;
    2829using HeuristicLab.MainForm.WindowsForms;
    … …  
    4041      InitializeComponent();
    4142      importInstanceButton.Image = VSImageLibrary.Open;
     43      reloadInstancesButton.Text = String.Empty;
     44      reloadInstancesButton.Image = VSImageLibrary.Refresh;
     45      loadInstanceButton.Image = VSImageLibrary.Internet;
    4246      Controls.Remove(parameterCollectionView);
    4347      parameterCollectionView.Dock = DockStyle.Fill;
    … …  
    102106      string instance = instancesComboBox.SelectedItem as string;
    103107      try {
    104         Content.LoadEmbeddedInstance(instance);
     108        //Content.LoadEmbeddedInstance(instance);
     109        using (QAPServiceReference.QAPClient client = new QAPServiceReference.QAPClient()) {
     110          var data = client.GetProblemInstanceData(instance);
     111          DoubleMatrix weights = new DoubleMatrix(data.Weights.Length, data.Weights.Length);
     112          DoubleMatrix distances = new DoubleMatrix(data.Weights.Length, data.Weights.Length);
     113          try {
     114            for (int i = 0; i < data.Weights.Length; i++)
     115              for (int j = 0; j < data.Weights.Length; j++) {
     116                weights[i, j] = data.Weights[i][j];
     117                distances[i, j] = data.Distances[i][j];
     118              }
     119          } catch (IndexOutOfRangeException) {
     120            MessageBox.Show("The problem data is malformed, the problem could not be loaded.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
     121          }
     122          Content.Name = data.Name;
     123          Content.Description = data.Description;
     124          Content.Maximization.Value = data.Maximization;
     125          Content.Weights = weights;
     126          Content.Distances = distances;
     127        }
    105128      } catch (Exception ex) {
    106129        PluginInfrastructure.ErrorHandling.ShowErrorDialog(ex);
    … …  
    133156      toolTip.SetToolTip(QAPLIBInstancesLabel, String.Empty);
    134157    }
     158
     159    private void reloadInstancesButton_Click(object sender, EventArgs e) {
     160      try {
     161        using (QAPServiceReference.QAPClient client = new QAPServiceReference.QAPClient()) {
     162          instancesComboBox.Items.Clear();
     163          foreach (string name in client.GetProblemInstances())
     164            instancesComboBox.Items.Add(name);
     165        }
     166      } catch (Exception ex) {
     167        PluginInfrastructure.ErrorHandling.ShowErrorDialog(ex);
     168      }
     169    }
    135170  }
    136171}

  • branches/GeneralizedQAP/HeuristicLab.Services.Deployment/3.3/HeuristicLab.Services.Deployment-3.3.csproj

    r5163 r6659  
    1414    <StartArguments>/client:"WcfTestClient.exe"</StartArguments>
    1515    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    16     <TargetFrameworkProfile></TargetFrameworkProfile>
     16    <TargetFrameworkProfile>
     17    </TargetFrameworkProfile>
    1718    <SignAssembly>true</SignAssembly>
    1819    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    … …  
    114115  </ItemGroup>
    115116  <ItemGroup>
    116     <None Include="App.config" />
     117    <None Include="App.config">
     118      <SubType>Designer</SubType>
     119    </None>
    117120  </ItemGroup>
    118121  <ItemGroup>

  • branches/GeneralizedQAP/HeuristicLab/3.3/MergeConfigs.cmd

    r4387 r6659  
    33ConfigMerger "%SolutionDir%\HeuristicLab.Optimizer\3.3\%Outdir%\HeuristicLab.Optimizer-3.3.dll.config" "HeuristicLab 3.3.exe.config"
    44ConfigMerger "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll.config" "HeuristicLab 3.3.exe.config"
     5ConfigMerger "%SolutionDir%\HeuristicLab.Problems.QuadraticAssignment.Views\3.3\%Outdir%\HeuristicLab.Problems.QuadraticAssignment.Views-3.3.dll.config" "HeuristicLab 3.3.exe.config"
    56ConfigMerger "%SolutionDir%\HeuristicLab.Tracing\3.3\%Outdir%\HeuristicLab.Tracing-3.3.dll.config" "HeuristicLab 3.3.exe.config"
Note: See TracChangeset for help on using the changeset viewer.