Changeset 15541 for branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PFSP

Timestamp:

12/19/17 11:10:14 (6 years ago)

Author:

fholzing

Message:

#2864: CleanUp of old code, added LOP benchmark instances

Location:

branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PFSP

Files:

• 3.3.7z (deleted)
• 3.3/FSSPTAILIBInstanceProvider.cs (modified) (2 diffs)
• 3.3/FSSPTAILIBParser.cs (modified) (2 diffs)
• 3.3/HeuristicLab.Problems.Instances.PFSP-3.3.csproj (modified) (3 diffs)
• 3.3/Properties/AssemblyInfo.cs (modified) (2 diffs)

branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PFSP/3.3/FSSPTAILIBInstanceProvider.cs

@@ -40 +40 @@
         public override string Description
         {
-            get { return "Permutation Flowshop scheduling problems as defined by Taillard."; }
+            get { return "Permutation Flowshop Scheduling Problems (PFSP) as defined by Taillard."; }
         }
 
@@ -112 +112 @@
         public override bool CanExportData
         {
-            get { return true; }
+            get { return false; }
         }
-
-        public override void ExportData(FSSPData instance, string path)
-        {
-            var parser = new FSSPTAILIBParser
-            {
-                Name = instance.Name,
-                Description = instance.Description,
-                Jobs = instance.Jobs,
-                Machines = instance.Machines,
-                ProcessingTimes = instance.ProcessingTimes,
-            };
-            parser.Export(path);
-        }
-
+        
         private string GetDescription()
         {

branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PFSP/3.3/FSSPTAILIBParser.cs

@@ -67 +67 @@
             }
         }
-
-        /// <summary>
-        /// Reads from the given stream data which is expected to be in the JSSP ORLIB format.
-        /// </summary>
-        /// <remarks>
-        /// The stream is not closed or disposed. The caller has to take care of that.
-        /// </remarks>
-        /// <param name="stream">The stream to read data from.</param>
+      
         public void Parse(Stream stream)
         {
@@ -111 +104 @@
             }
         }
-
-        /// <summary>
-        /// Writes to the given stream data which is expected to be in the JSSP ORLIB format.
-        /// </summary>
-        /// <remarks>
-        /// The stream is not closed or disposed. The caller has to take care of that.
-        /// </remarks>
-        /// <param name="stream">The stream to write data to.</param>
+    
         public void Export(Stream stream)
         {
-            //TODO: complete Export, seems as if it is just a dummy (copy-paste)-implementation
             using (var writer = new StreamWriter(stream, Encoding.UTF8, 4092, true))
             {
                 writer.WriteLine(Name);
                 writer.WriteLine(Description);
-                writer.WriteLine(Jobs.ToString(CultureInfo.InvariantCulture.NumberFormat) + " " + Machines.ToString(CultureInfo.InvariantCulture.NumberFormat));
-                for (int i = 0; i < Machines; i++)
+                writer.WriteLine(Jobs + '\t' + Machines);
+                writer.WriteLine(BestKnownQuality);
+
+                for (int k = 0; k < Machines; k++)
                 {
-                    for (int j = 0; j < Jobs; j++)
+                    for (int i = 0; i < Jobs; i++)
                     {
-                        writer.Write(ProcessingTimes[i, j] + " ");
+                        writer.Write(ProcessingTimes[k, i] + "\t");
                     }
                     writer.WriteLine();
+                }
+
+                if (BestKnownSchedule != null) {
+                    writer.WriteLine(BestKnownSchedule);
                 }
                 writer.Flush();
             }
         }
-
     }
 }

branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PFSP/3.3/HeuristicLab.Problems.Instances.PFSP-3.3.csproj

@@ -18 +18 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -62 +68 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
-      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
-      <Name>HeuristicLab.Common-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
-      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
       <Name>HeuristicLab.Problems.Instances-3.3</Name>
     </ProjectReference>

branches/2864_PermutationProblems/HeuristicLab.Problems.Instances.PFSP/3.3/Properties/AssemblyInfo.cs

@@ -1 @@
-using System.Reflection;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -34 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.14.14965")]
+[assembly: AssemblyFileVersion("3.3.14.15521")]