Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/13/12 16:35:13 (13 years ago)
Author:
abeham
Message:

#1614

  • included TSLIB's ATSP and CVRP problems as well
Location:
branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3
Files:
2 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

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

    • Property svn:ignore

      •  

        old new  
        11obj
        22bin
         3Plugin.cs

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

    r7465 r7466  
    5252  <ItemGroup>
    5353    <None Include="Plugin.cs.frame" />
     54    <Compile Include="Instances\IATSPInstance.cs" />
    5455    <Compile Include="Instances\ICTAPInstance.cs" />
    5556    <Compile Include="IInstanceDescriptor.cs" />
     57    <Compile Include="Instances\ICVRPInstance.cs" />
    5658    <Compile Include="Instances\IQAPInstance.cs" />
    5759    <Compile Include="Instances\ITSPInstance.cs" />

  • branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs

    r7448 r7466  
    2424
    2525  public interface IProblemInstanceConsumer<TInstance> : IProblemInstanceConsumer {
    26     void LoadFrom(TInstance instance);
     26    bool LoadFrom(TInstance instance);
    2727  }
    2828}

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

    r7448 r7466  
    3333
    3434    void SetConsumer(IProblemInstanceConsumer consumer);
    35     void FeedConsumer(IInstanceDescriptor descriptor);
     35    bool FeedConsumer(IInstanceDescriptor descriptor);
    3636
    3737    IEnumerable<IInstanceDescriptor> GetInstanceDescriptors();

  • branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/Instances/ICTAPInstance.cs

    r7445 r7466  
    2121
    2222namespace HeuristicLab.Problems.Instances {
     23  /// <summary>
     24  /// Describes instances of the Capacitated Task Assignment Problem (CTAP).
     25  /// </summary>
    2326  public interface ICTAPInstance {
    2427    /// <summary>
    … …  
    3134    string Description { get; }
    3235
     36    /// <summary>
     37    /// The number M of processors
     38    /// </summary>
     39    int Processors { get; }
     40    /// <summary>
     41    /// The number N of tasks
     42    /// </summary>
     43    int Tasks { get; }
    3344    /// <summary>
    3445    /// An MxN Matrix with M = |Processors| and N = |Tasks|

  • branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/Instances/IQAPInstance.cs

    r7445 r7466  
    2121
    2222namespace HeuristicLab.Problems.Instances {
     23  /// <summary>
     24  /// Describes instances of the Quadratic Assignment Problem (QAP).
     25  /// </summary>
    2326  public interface IQAPInstance {
    2427    /// <summary>
    … …  
    3134    string Description { get; }
    3235
     36    /// <summary>
     37    /// The number of facilities (and also the number of locations)
     38    /// </summary>
     39    int Dimension { get; }
    3340    /// <summary>
    3441    /// An NxN Matrix with N = |Faciliies|

  • branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/Instances/ITSPInstance.cs

    r7465 r7466  
    2222
    2323namespace HeuristicLab.Problems.Instances {
    24   public enum TSPDistanceMeasure { Direct, Euclidean, RoundedEuclidean, Geo };
     24  public enum TSPDistanceMeasure { Direct, Euclidean, RoundedEuclidean, UpperEuclidean, Geo, Manhattan, Maximum, Att };
    2525
     26  /// <summary>
     27  /// Describes instances of the Traveling Salesman Problem (TSP).
     28  /// </summary>
    2629  public interface ITSPInstance {
    2730    /// <summary>
    … …  
    3538
    3639    /// <summary>
     40    /// The number of cities.
     41    /// </summary>
     42    int Dimension { get; }
     43    /// <summary>
    3744    /// Specifies the distance measure that is to be used.
    38     ///
    39     /// Direct           = The distances are given in form of the distance matrix.
    40     /// Euclidean        = The distances are calculated as euclidean distance.
    41     /// RoundedEuclidean = Each individual euclidean distance is rounded before
    42     ///                    being summed.
    43     /// Geo              = The coordinates specify points on the surface of the
    44     ///                    earth and the distances are arc distances.
    4545    /// </summary>
    4646    TSPDistanceMeasure DistanceMeasure { get; }
    … …  
    5353    double[,] Distances { get; }
    5454    /// <summary>
    55     /// Optional! A a matrix of dimension [N, 2] where each row is one of the cities
     55    /// Optional! A a matrix of dimension [N, 2] matrix where each row is one of the cities
    5656    /// and the colmns represent x and y coordinates respectively.
    5757    /// </summary>
    … …  
    7474    /// </summary>
    7575    double? BestKnownQuality { get; }
     76
     77    /// <summary>
     78    /// If only the coordinates are given, can calculate the distance matrix.
     79    /// </summary>
     80    /// <returns>A full distance matrix between all cities.</returns>
     81    double[,] GetDistanceMatrix();
    7682  }
    7783}

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

    r7465 r7466  
    4141    }
    4242
    43     public void FeedConsumer(IInstanceDescriptor descriptor) {
    44       Consumer.LoadFrom(GetInstance(descriptor));
     43    public bool FeedConsumer(IInstanceDescriptor descriptor) {
     44      return Consumer.LoadFrom(GetInstance(descriptor));
    4545    }
    4646
Note: See TracChangeset for help on using the changeset viewer.