Changeset 7842 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances

Timestamp:

05/16/12 16:28:49 (13 years ago)

Author:

gkronber

Message:

merged r7609:7840 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances (modified) (1 prop)
• HeuristicLab.Problems.Instances/3.3 (modified) (1 prop)
• HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.Instances/3.3/IExportable.cs (deleted)
• HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/IProblemInstanceExporter.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances/3.3/IProblemInstanceExporter.cs)
• HeuristicLab.Problems.Instances/3.3/IProblemInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/ProblemInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/TableFileParser.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances/3.3/TableFileParser.cs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances/3.3

@@ -2 +2 @@
 bin
 Plugin.cs
+*.user

@@ -2 +2 @@
 bin
 Plugin.cs
+*.user

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

@@ -26 +26 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -111 +111 @@
   <ItemGroup>
     <None Include="Plugin.cs.frame" />
-    <Compile Include="IExportable.cs" />
+    <Compile Include="IProblemInstanceExporter.cs" />
+    <Compile Include="TableFileParser.cs" />
     <Compile Include="Types\ATSPData.cs" />
     <Compile Include="Types\CTAPData.cs" />
@@ -133 +134 @@
       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
       <Name>HeuristicLab.Common-3.3</Name>
+      <Private>False</Private>
     </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>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
+
 namespace HeuristicLab.Problems.Instances {
-  public interface IProblemInstanceConsumer<TData> {
+  public interface IProblemInstanceConsumer : IContent { }
+
+  public interface IProblemInstanceConsumer<TData> : IProblemInstanceConsumer {
     /// <summary>
     /// Loads the given instance data.

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

@@ -33 +33 @@
 
   public interface IProblemInstanceProvider<TData> : IProblemInstanceProvider {
-    IProblemInstanceConsumer<TData> Consumer { get; set; }
-
     IEnumerable<IDataDescriptor> GetDataDescriptors();
     TData LoadData(IDataDescriptor descriptor);
     TData LoadData(string path);
-    
+
     void SaveData(TData instance, string path);
   }

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

@@ -25 +25 @@
 namespace HeuristicLab.Problems.Instances {
   public abstract class ProblemInstanceProvider<TData> : IProblemInstanceProvider<TData> {
-    public virtual IProblemInstanceConsumer<TData> Consumer { get; set; }
-
     public abstract string Name { get; }
     public abstract string Description { get; }

@@ -2 +2 @@
 bin
 Plugin.cs
+*.user