Changeset 13305


Ignore:
Timestamp:
11/19/15 15:45:39 (4 years ago)
Author:
ascheibe
Message:

#2428 merged r12793, r13093, r13219, r13253 into stable

Location:
stable
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeParser.cs

    r12721 r13305  
    179179          // Remove the 'm,'
    180180          inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
    181           // Extract the number of points
    182           bool matrixGiven = true;
    183 
     181                   
    184182          pointCount = Coordinates.GetLength(1);
    185183          Distances = new double[pointCount, pointCount];
  • stable/HeuristicLab.Problems.NK/3.3

    • Property svn:ignore set to
      bin
      obj
      Plugin.cs
  • stable/HeuristicLab.Services.Access.DataAccess/3.3/HeuristicLab.Services.Access.DataAccess-3.3.csproj

    r11920 r13305  
    131131    <None Include="Properties\AssemblyInfo.cs.frame" />
    132132    <None Include="Properties\Settings.settings">
    133       <Generator>SettingsSingleFileGenerator</Generator>
     133      <Generator>PublicSettingsSingleFileGenerator</Generator>
    134134      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
    135135    </None>
  • stable/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.Designer.cs

    r11920 r13305  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.34014
     4//     Runtime Version:4.0.30319.42000
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    1515    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
    16     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
     16    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
    1818        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
  • stable/Test.cmd

    r11907 r13305  
    2222ECHO Test starting for category %TESTCATEGORY%...
    2323
    24 FOR /F "tokens=1,2,* delims=   " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\SxS\VS7"') DO (
    25   IF "%%A"=="12.0" SET VSPATH=%%C)
     24FOR /F "tokens=1,2,* delims=   " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7"') DO (
     25  IF "%%A"=="14.0" SET VSPATH=%%C)
    2626
    2727"%VSPATH%Common7\IDE\CommonExtensions\Microsoft\TestWindow\VSTest.Console.exe" bin\HeuristicLab.Tests.dll /Framework:framework40 /Platform:%TESTPLATFORM% /TestCaseFilter:"TestCategory=%TESTCATEGORY%"
Note: See TracChangeset for help on using the changeset viewer.