Changeset 13305

Timestamp:

11/19/15 15:45:39 (9 years ago)

Author:

ascheibe

Message:

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

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeParser.cs (modified) (1 diff)
• HeuristicLab.Problems.NK/3.3 (modified) (1 prop)
• HeuristicLab.Services.Access.DataAccess/3.3/HeuristicLab.Services.Access.DataAccess-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.Designer.cs (modified) (2 diffs)
• Test.cmd (modified) (1 diff)

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

@@ -179 +179 @@
           // Remove the 'm,'
           inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
-          // Extract the number of points
-          bool matrixGiven = true;
-
+                    
           pointCount = Coordinates.GetLength(1);
           Distances = new double[pointCount, pointCount];

stable/HeuristicLab.Services.Access.DataAccess/3.3/HeuristicLab.Services.Access.DataAccess-3.3.csproj

@@ -131 +131 @@
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>

stable/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -14 +14 @@
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

stable/Test.cmd

@@ -22 +22 @@
 ECHO Test starting for category %TESTCATEGORY%...
 
-FOR /F "tokens=1,2,* delims=   " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\SxS\VS7"') DO (
-  IF "%%A"=="12.0" SET VSPATH=%%C)
+FOR /F "tokens=1,2,* delims=   " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7"') DO (
+  IF "%%A"=="14.0" SET VSPATH=%%C)
 
 "%VSPATH%Common7\IDE\CommonExtensions\Microsoft\TestWindow\VSTest.Console.exe" bin\HeuristicLab.Tests.dll /Framework:framework40 /Platform:%TESTPLATFORM% /TestCaseFilter:"TestCategory=%TESTCATEGORY%"