Changeset 7548 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3

Timestamp:

03/05/12 16:30:27 (12 years ago)

Author:

abeham

Message:

#1614: changed according to architects review

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3

Files:

• CordeauGQAPDataDescriptor.cs (added)
• CordeauGQAPInstanceDescriptor.cs (deleted)
• CordeauGQAPInstanceProvider.cs (modified) (4 diffs)
• HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPInstanceProvider.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.Instances.CordeauGQAP {
-  public class CordeauGQAPInstanceProvider : ProblemInstanceProvider<GQAPInstance> {
+  public class CordeauGQAPInstanceProvider : ProblemInstanceProvider<GQAPData> {
     public override string Name {
       get { return "Cordeau et al. GQAP instances"; }
@@ -49 +49 @@
     }
 
-    public override IEnumerable<IInstanceDescriptor> GetInstanceDescriptors() {
+    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       return Assembly.GetExecutingAssembly()
           .GetManifestResourceNames()
           .Where(x => x.EndsWith(".txt"))
           .OrderBy(x => x)
-          .Select(x => new CordeauGQAPInstanceDescriptor(GetPrettyName(x), GetDescription(), x));
+          .Select(x => new CordeauGQAPDataDescriptor(GetPrettyName(x), GetDescription(), x));
     }
 
-    public override GQAPInstance LoadInstance(IInstanceDescriptor id) {
-      var descriptor = (CordeauGQAPInstanceDescriptor)id;
+    public override GQAPData LoadData(IDataDescriptor id) {
+      var descriptor = (CordeauGQAPDataDescriptor)id;
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
@@ -72 +72 @@
     }
 
-    public override GQAPInstance LoadInstance(string path) {
+    public override GQAPData LoadData(string path) {
       var parser = new CordeauGQAPParser();
       parser.Parse(path);
@@ -83 +83 @@
     }
 
-    public override void SaveInstance(GQAPInstance instance, string path) {
+    public override void SaveData(GQAPData instance, string path) {
       throw new NotSupportedException();
     }
 
-    private GQAPInstance Load(CordeauGQAPParser parser) {
-      var instance = new GQAPInstance();
+    private GQAPData Load(CordeauGQAPParser parser) {
+      var instance = new GQAPData();
       instance.Equipments = parser.Equipments;
       instance.Locations = parser.Locations;

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj

@@ -112 +112 @@
     <Compile Include="CordeauGQAPParser.cs" />
     <Compile Include="CordeauGQAPInstanceProvider.cs" />
-    <Compile Include="CordeauGQAPInstanceDescriptor.cs" />
+    <Compile Include="CordeauGQAPDataDescriptor.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />