Changeset 7548 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances/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/3.3

Files:

• HeuristicLab.Problems.Instances-3.3.csproj (modified) (1 diff)
• IConsumable.cs (deleted)
• IDataDescriptor.cs (added)
• IInstanceDescriptor.cs (deleted)
• IProblemInstanceConsumer.cs (added)
• IProblemInstanceProvider.cs (modified) (1 diff)
• Instances (deleted)
• ProblemInstanceProvider.cs (modified) (2 diffs)
• Types (added)
• Types/ATSPData.cs (added)
• Types/CTAPData.cs (added)
• Types/CVRPData.cs (added)
• Types/GQAPData.cs (added)
• Types/QAPData.cs (added)
• Types/TSPData.cs (added)

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

@@ -54 +54 @@
     <None Include="Plugin.cs.frame" />
     <Compile Include="IExportable.cs" />
-    <Compile Include="Instances\ATSPInstance.cs" />
-    <Compile Include="Instances\CTAPInstance.cs" />
-    <Compile Include="IInstanceDescriptor.cs" />
-    <Compile Include="Instances\CVRPInstance.cs" />
-    <Compile Include="Instances\GQAPInstance.cs" />
-    <Compile Include="Instances\QAPInstance.cs" />
-    <Compile Include="Instances\TSPInstance.cs" />
-    <Compile Include="IConsumable.cs" />
+    <Compile Include="Types\ATSPData.cs" />
+    <Compile Include="Types\CTAPData.cs" />
+    <Compile Include="IDataDescriptor.cs" />
+    <Compile Include="Types\CVRPData.cs" />
+    <Compile Include="Types\GQAPData.cs" />
+    <Compile Include="Types\QAPData.cs" />
+    <Compile Include="Types\TSPData.cs" />
+    <Compile Include="IProblemInstanceConsumer.cs" />
     <Compile Include="IProblemInstanceProvider.cs" />
     <Compile Include="Plugin.cs" />

branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/IProblemInstanceProvider.cs

@@ -32 +32 @@
   }
 
-  public interface IProblemInstanceProvider<TInstance> : IProblemInstanceProvider {
-    IConsumable<TInstance> Consumer { get; set; }
+  public interface IProblemInstanceProvider<TData> : IProblemInstanceProvider {
+    IProblemInstanceConsumer<TData> Consumer { get; set; }
 
-    IEnumerable<IInstanceDescriptor> GetInstanceDescriptors();
-    TInstance LoadInstance(IInstanceDescriptor descriptor);
-    TInstance LoadInstance(string path);
-
-    void SaveInstance(TInstance instance, string path);
+    IEnumerable<IDataDescriptor> GetDataDescriptors();
+    TData LoadData(IDataDescriptor descriptor);
+    TData LoadData(string path);
+    
+    void SaveData(TData instance, string path);
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/ProblemInstanceProvider.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.Instances {
-  public abstract class ProblemInstanceProvider<TInstance> : IProblemInstanceProvider<TInstance> {
-    public virtual IConsumable<TInstance> Consumer { get; set; }
+  public abstract class ProblemInstanceProvider<TData> : IProblemInstanceProvider<TData> {
+    public virtual IProblemInstanceConsumer<TData> Consumer { get; set; }
 
     public abstract string Name { get; }
@@ -32 +32 @@
     public abstract string ReferencePublication { get; }
 
-    public abstract IEnumerable<IInstanceDescriptor> GetInstanceDescriptors();
+    public abstract IEnumerable<IDataDescriptor> GetDataDescriptors();
 
-    public abstract TInstance LoadInstance(IInstanceDescriptor descriptor);
-    public abstract TInstance LoadInstance(string path);
+    public abstract TData LoadData(IDataDescriptor descriptor);
+    public abstract TData LoadData(string path);
 
-    public abstract void SaveInstance(TInstance instance, string path);
+    public abstract void SaveData(TData instance, string path);
   }
 }