- Timestamp:
- 05/16/12 16:28:49 (12 years ago)
- Location:
- branches/HeuristicLab.TimeSeries
- Files:
-
- 1 deleted
- 7 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.TimeSeries
- Property svn:mergeinfo changed
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Problems.Instances merged eligible /branches/Benchmarking/sources/HeuristicLab.Problems.Instances 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.Instances 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.Instances 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.Instances 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.Instances 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.Instances 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.Instances 5060 /branches/NET40/sources/HeuristicLab.Problems.Instances 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.Instances 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.Instances 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.Instances 6828 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.Instances 5370-5682 /branches/Trunk/HeuristicLab.Problems.Instances 6829-6865 /branches/VNS/HeuristicLab.Problems.Instances 5594-5752 /branches/histogram/HeuristicLab.Problems.Instances 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances/3.3
- Property svn:ignore
-
old new 2 2 bin 3 3 Plugin.cs 4 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj
r7600 r7842 26 26 <DebugType>pdbonly</DebugType> 27 27 <Optimize>true</Optimize> 28 <OutputPath>..\..\ bin\</OutputPath>28 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 29 29 <DefineConstants>TRACE</DefineConstants> 30 30 <ErrorReport>prompt</ErrorReport> … … 111 111 <ItemGroup> 112 112 <None Include="Plugin.cs.frame" /> 113 <Compile Include="IExportable.cs" /> 113 <Compile Include="IProblemInstanceExporter.cs" /> 114 <Compile Include="TableFileParser.cs" /> 114 115 <Compile Include="Types\ATSPData.cs" /> 115 116 <Compile Include="Types\CTAPData.cs" /> … … 133 134 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> 134 135 <Name>HeuristicLab.Common-3.3</Name> 136 <Private>False</Private> 135 137 </ProjectReference> 136 138 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj"> 137 139 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> 138 140 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 141 <Private>False</Private> 139 142 </ProjectReference> 140 143 </ItemGroup> -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs
r7548 r7842 20 20 #endregion 21 21 22 using HeuristicLab.Common; 23 22 24 namespace HeuristicLab.Problems.Instances { 23 public interface IProblemInstanceConsumer<TData> { 25 public interface IProblemInstanceConsumer : IContent { } 26 27 public interface IProblemInstanceConsumer<TData> : IProblemInstanceConsumer { 24 28 /// <summary> 25 29 /// Loads the given instance data. -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances/3.3/IProblemInstanceProvider.cs
r7548 r7842 33 33 34 34 public interface IProblemInstanceProvider<TData> : IProblemInstanceProvider { 35 IProblemInstanceConsumer<TData> Consumer { get; set; }36 37 35 IEnumerable<IDataDescriptor> GetDataDescriptors(); 38 36 TData LoadData(IDataDescriptor descriptor); 39 37 TData LoadData(string path); 40 38 41 39 void SaveData(TData instance, string path); 42 40 } -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances/3.3/ProblemInstanceProvider.cs
r7548 r7842 25 25 namespace HeuristicLab.Problems.Instances { 26 26 public abstract class ProblemInstanceProvider<TData> : IProblemInstanceProvider<TData> { 27 public virtual IProblemInstanceConsumer<TData> Consumer { get; set; }28 29 27 public abstract string Name { get; } 30 28 public abstract string Description { get; }
Note: See TracChangeset
for help on using the changeset viewer.