Changeset 7683


Ignore:
Timestamp:
04/02/12 13:53:51 (10 years ago)
Author:
sforsten
Message:

#1784:

  • added abstract ProblemInstanceProviderView
  • changes !IProblemInstanceConsumer and !IProblemInstanceExporter interfaces
  • deleted unnecessary files
Location:
branches/ProblemInstancesRegressionAndClassification
Files:
2 added
3 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

    r7682 r7683  
    3333  [Creatable("Problems")]
    3434  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent,
    35     IProblemInstanceConsumer<ClassificationData>, IProblemInstanceExporter<ClassificationData>, IProblemInstanceConsumer {
     35    IProblemInstanceConsumer<ClassificationData>, IProblemInstanceExporter<ClassificationData>, IProblemInstanceConsumer, IProblemInstanceExporter {
    3636    public string Filename { get; set; }
    3737
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

    r7682 r7683  
    3333  [Creatable("Problems")]
    3434  public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem, IStorableContent,
    35     IProblemInstanceConsumer<RegressionData>, IProblemInstanceExporter<RegressionData>, IProblemInstanceConsumer {
     35    IProblemInstanceConsumer<RegressionData>, IProblemInstanceExporter<RegressionData> {
    3636    public string Filename { get; set; }
    3737
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4

    • Property svn:ignore set to
      *
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/HeuristicLab.Problems.Instances.Classification-3.4.csproj

    r7682 r7683  
    5454    <Compile Include="ArtificialClassificationDataDescriptor.cs" />
    5555    <Compile Include="ArtificialClassificationInstanceProvider.cs" />
     56    <Compile Include="Plugin.cs" />
    5657    <Compile Include="Properties\AssemblyInfo.cs" />
    5758    <Compile Include="ClassificationInstanceProvider.cs" />
     
    6162  </ItemGroup>
    6263  <ItemGroup>
    63     <None Include="Data\RealWorld.zip" />
     64    <EmbeddedResource Include="Data\RealWorld.zip" />
    6465    <None Include="Properties\AssemblyInfo.cs.frame" />
    6566    <None Include="HeuristicLab.snk" />
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/Properties

    • Property svn:ignore set to
      AssemblyInfo.cs
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Properties/AssemblyInfo.cs

    r7682 r7683  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.4.0.0")]
    57 [assembly: AssemblyFileVersion("3.4.0.7667")]
     57[assembly: AssemblyFileVersion("3.4.0.7682")]
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4

    • Property svn:ignore
      •  

        old new  
        22HeuristicLab.Problems.Instances.Views-3.4.csproj.user
        33obj
         4Plugin.cs
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/HeuristicLab.Problems.Instances.Views-3.4.csproj

    r7665 r7683  
    5454  </ItemGroup>
    5555  <ItemGroup>
     56    <Compile Include="ProblemInstanceProviderView.cs">
     57      <SubType>UserControl</SubType>
     58    </Compile>
     59    <Compile Include="ProblemInstanceProviderView.Designer.cs">
     60      <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon>
     61    </Compile>
    5662    <Compile Include="Plugin.cs" />
    5763    <Compile Include="ProblemInstanceConsumerView.cs">
     
    6167      <DependentUpon>ProblemInstanceConsumerView.cs</DependentUpon>
    6268    </Compile>
    63     <Compile Include="ProblemInstanceProviderView.cs">
     69    <Compile Include="ProblemInstanceProviderViewGeneric.cs">
    6470      <SubType>UserControl</SubType>
    6571    </Compile>
    66     <Compile Include="ProblemInstanceProviderView.Designer.cs">
    67       <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon>
     72    <Compile Include="ProblemInstanceProviderViewGeneric.Designer.cs">
     73      <DependentUpon>ProblemInstanceProviderViewGeneric.cs</DependentUpon>
    6874    </Compile>
    6975    <Compile Include="Properties\AssemblyInfo.cs" />
     
    7884      <Name>HeuristicLab.Problems.Instances-3.3</Name>
    7985    </ProjectReference>
     86  </ItemGroup>
     87  <ItemGroup>
     88    <EmbeddedResource Include="ProblemInstanceConsumerView.resx">
     89      <DependentUpon>ProblemInstanceConsumerView.cs</DependentUpon>
     90    </EmbeddedResource>
    8091  </ItemGroup>
    8192  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceConsumerView.Designer.cs

    r7665 r7683  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.components = new System.ComponentModel.Container();
    4748      this.problemInstanceProviderComboBox = new System.Windows.Forms.ComboBox();
    4849      this.libraryInfoButton = new System.Windows.Forms.Button();
    4950      this.libraryLabel = new System.Windows.Forms.Label();
    5051      this.problemInstanceProviderViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     52      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    5153      this.SuspendLayout();
    5254      //
     
    117119    private System.Windows.Forms.Label libraryLabel;
    118120    private MainForm.WindowsForms.ViewHost problemInstanceProviderViewHost;
     121    private System.Windows.Forms.ToolTip toolTip;
    119122  }
    120123}
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceConsumerView.cs

    r7665 r7683  
    7474      if (problemInstanceProviderComboBox.SelectedIndex >= 0) {
    7575        problemInstanceProviderViewHost.Content = SelectedProvider;
    76         dynamic view = problemInstanceProviderViewHost.ActiveView;
    77         dynamic content = Content;
    78         view.Consumer = content;
    79         if (CheckForIProblemInstanceExporter(Content))
    80           view.Exporter = content;
    81         //SetTooltip();
     76        ProblemInstanceProviderView view = (ProblemInstanceProviderView)problemInstanceProviderViewHost.ActiveView;
     77        view.Consumer = Content;
     78        if (CheckForIProblemInstanceExporter(Content)) {
     79          view.Exporter = (IProblemInstanceExporter)Content;
     80        }
     81        SetTooltip();
    8282      }
    8383      SetEnabledStateOfControls();
     
    8585
    8686    private bool CheckForIProblemInstanceExporter(IProblemInstanceConsumer content) {
    87       // no check if IProblemInstanceConsumer<T> and IProblemInstanceExporter<T> have the same generic type T
    8887      return Content.GetType().GetInterfaces()
    89                     .Any(x => x.IsGenericType && x.GetGenericTypeDefinition().Equals(typeof(IProblemInstanceExporter<>)));
     88                    .Any(x => x.Equals(typeof(IProblemInstanceExporter)));
    9089    }
    9190
     
    120119    }
    121120
    122     //protected void SetTooltip() {
    123     //  toolTip.SetToolTip(problemInstanceProviderComboBox, GetProviderToolTip());
    124     //  if (SelectedProvider.WebLink != null)
    125     //    toolTip.SetToolTip(libraryInfoButton, "Browse to " + SelectedProvider.WebLink.ToString());
    126     //  else toolTip.SetToolTip(libraryInfoButton, "Library does not have a web reference.");
    127     //}
     121    private void SetTooltip() {
     122      toolTip.SetToolTip(problemInstanceProviderComboBox, GetProviderToolTip());
     123      if (SelectedProvider.WebLink != null)
     124        toolTip.SetToolTip(libraryInfoButton, "Browse to " + SelectedProvider.WebLink.ToString());
     125      else toolTip.SetToolTip(libraryInfoButton, "Library does not have a web reference.");
     126    }
    128127
    129     //protected string GetProviderToolTip() {
    130     //  var provider = SelectedProvider;
    131     //  string toolTip = provider.Name;
     128    private string GetProviderToolTip() {
     129      var provider = SelectedProvider;
     130      string toolTip = provider.Name;
    132131
    133     //  if (!String.IsNullOrEmpty(provider.ReferencePublication)) {
    134     //    toolTip = toolTip
    135     //        + Environment.NewLine + Environment.NewLine
    136     //        + provider.ReferencePublication;
    137     //  }
    138     //  if (provider.WebLink != null) {
    139     //    toolTip = toolTip
    140     //        + Environment.NewLine
    141     //        + provider.WebLink.ToString();
    142     //  }
     132      if (!String.IsNullOrEmpty(provider.ReferencePublication)) {
     133        toolTip = toolTip
     134            + Environment.NewLine + Environment.NewLine
     135            + provider.ReferencePublication;
     136      }
     137      if (provider.WebLink != null) {
     138        toolTip = toolTip
     139            + Environment.NewLine
     140            + provider.WebLink.ToString();
     141      }
    143142
    144     //  return toolTip;
    145     //}
     143      return toolTip;
     144    }
    146145  }
    147146}
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceProviderView.Designer.cs

    r7665 r7683  
    2121
    2222namespace HeuristicLab.Problems.Instances.Views {
    23   partial class ProblemInstanceProviderView<T> {
     23  partial class ProblemInstanceProviderView {
    2424    /// <summary>
    2525    /// Required designer variable.
     
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.components = new System.ComponentModel.Container();
    48       this.loadButton = new System.Windows.Forms.Button();
    49       this.instanceLabel = new System.Windows.Forms.Label();
    50       this.instancesComboBox = new System.Windows.Forms.ComboBox();
    51       this.importButton = new System.Windows.Forms.Button();
    52       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
    53       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    54       this.exportButton = new System.Windows.Forms.Button();
    55       this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
    56       this.problemInstanceProviderSplitContainer = new System.Windows.Forms.SplitContainer();
    57       ((System.ComponentModel.ISupportInitialize)(this.problemInstanceProviderSplitContainer)).BeginInit();
    58       this.problemInstanceProviderSplitContainer.Panel1.SuspendLayout();
    59       this.problemInstanceProviderSplitContainer.Panel2.SuspendLayout();
    60       this.problemInstanceProviderSplitContainer.SuspendLayout();
    6147      this.SuspendLayout();
    62       //
    63       // loadButton
    64       //
    65       this.loadButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    66       this.loadButton.Location = new System.Drawing.Point(604, 0);
    67       this.loadButton.Name = "loadButton";
    68       this.loadButton.Size = new System.Drawing.Size(26, 23);
    69       this.loadButton.TabIndex = 6;
    70       this.loadButton.Text = "Load";
    71       this.loadButton.UseVisualStyleBackColor = true;
    72       this.loadButton.Click += new System.EventHandler(this.loadButton_Click);
    73       //
    74       // instanceLabel
    75       //
    76       this.instanceLabel.AutoSize = true;
    77       this.instanceLabel.Location = new System.Drawing.Point(3, 4);
    78       this.instanceLabel.Name = "instanceLabel";
    79       this.instanceLabel.Size = new System.Drawing.Size(51, 13);
    80       this.instanceLabel.TabIndex = 4;
    81       this.instanceLabel.Text = "Instance:";
    82       //
    83       // instancesComboBox
    84       //
    85       this.instancesComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    86             | System.Windows.Forms.AnchorStyles.Right)));
    87       this.instancesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    88       this.instancesComboBox.FormattingEnabled = true;
    89       this.instancesComboBox.Location = new System.Drawing.Point(60, 1);
    90       this.instancesComboBox.Name = "instancesComboBox";
    91       this.instancesComboBox.Size = new System.Drawing.Size(538, 21);
    92       this.instancesComboBox.TabIndex = 7;
    93       this.instancesComboBox.DataSourceChanged += new System.EventHandler(this.comboBox_DataSourceChanged);
    94       //
    95       // importButton
    96       //
    97       this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    98       this.importButton.Location = new System.Drawing.Point(636, 0);
    99       this.importButton.Name = "importButton";
    100       this.importButton.Size = new System.Drawing.Size(26, 23);
    101       this.importButton.TabIndex = 6;
    102       this.importButton.Text = "Import";
    103       this.importButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
    104       this.importButton.UseVisualStyleBackColor = true;
    105       this.importButton.Click += new System.EventHandler(this.importButton_Click);
    106       //
    107       // openFileDialog
    108       //
    109       this.openFileDialog.Filter = "All files|*.*";
    110       //
    111       // exportButton
    112       //
    113       this.exportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    114       this.exportButton.Location = new System.Drawing.Point(-1, 0);
    115       this.exportButton.Name = "exportButton";
    116       this.exportButton.Size = new System.Drawing.Size(26, 23);
    117       this.exportButton.TabIndex = 8;
    118       this.exportButton.Text = "Export";
    119       this.exportButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
    120       this.exportButton.UseVisualStyleBackColor = true;
    121       this.exportButton.Click += new System.EventHandler(this.exportButton_Click);
    122       //
    123       // saveFileDialog
    124       //
    125       this.saveFileDialog.Filter = "CSV files|*.csv|All files|*.*";
    126       this.saveFileDialog.Title = "Save RegressionInstance...";
    127       //
    128       // problemInstanceProviderSplitContainer
    129       //
    130       this.problemInstanceProviderSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    131             | System.Windows.Forms.AnchorStyles.Left)
    132             | System.Windows.Forms.AnchorStyles.Right)));
    133       this.problemInstanceProviderSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
    134       this.problemInstanceProviderSplitContainer.IsSplitterFixed = true;
    135       this.problemInstanceProviderSplitContainer.Location = new System.Drawing.Point(0, -1);
    136       this.problemInstanceProviderSplitContainer.Name = "problemInstanceProviderSplitContainer";
    137       //
    138       // problemInstanceProviderSplitContainer.Panel1
    139       //
    140       this.problemInstanceProviderSplitContainer.Panel1.Controls.Add(this.instanceLabel);
    141       this.problemInstanceProviderSplitContainer.Panel1.Controls.Add(this.instancesComboBox);
    142       this.problemInstanceProviderSplitContainer.Panel1.Controls.Add(this.importButton);
    143       this.problemInstanceProviderSplitContainer.Panel1.Controls.Add(this.loadButton);
    144       //
    145       // problemInstanceProviderSplitContainer.Panel2
    146       //
    147       this.problemInstanceProviderSplitContainer.Panel2.Controls.Add(this.exportButton);
    148       this.problemInstanceProviderSplitContainer.Size = new System.Drawing.Size(694, 22);
    149       this.problemInstanceProviderSplitContainer.SplitterDistance = 665;
    150       this.problemInstanceProviderSplitContainer.TabIndex = 9;
    15148      //
    15249      // ProblemInstanceProviderView
     
    15451      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    15552      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    156       this.Controls.Add(this.problemInstanceProviderSplitContainer);
    15753      this.Name = "ProblemInstanceProviderView";
    15854      this.Size = new System.Drawing.Size(694, 21);
    159       this.problemInstanceProviderSplitContainer.Panel1.ResumeLayout(false);
    160       this.problemInstanceProviderSplitContainer.Panel1.PerformLayout();
    161       this.problemInstanceProviderSplitContainer.Panel2.ResumeLayout(false);
    162       ((System.ComponentModel.ISupportInitialize)(this.problemInstanceProviderSplitContainer)).EndInit();
    163       this.problemInstanceProviderSplitContainer.ResumeLayout(false);
    16455      this.ResumeLayout(false);
    16556
     
    16859    #endregion
    16960
    170     private System.Windows.Forms.OpenFileDialog openFileDialog;
    171     private System.Windows.Forms.ToolTip toolTip;
    172     protected System.Windows.Forms.Button loadButton;
    173     protected System.Windows.Forms.Label instanceLabel;
    174     protected System.Windows.Forms.ComboBox instancesComboBox;
    175     protected System.Windows.Forms.Button importButton;
    176     protected System.Windows.Forms.Button exportButton;
    177     private System.Windows.Forms.SaveFileDialog saveFileDialog;
    178     private System.Windows.Forms.SplitContainer problemInstanceProviderSplitContainer;
    17961
    18062  }
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceProviderView.cs

    r7665 r7683  
    2020#endregion
    2121
    22 using System;
    23 using System.IO;
    24 using System.Linq;
    2522using System.Windows.Forms;
    26 using HeuristicLab.Common.Resources;
    2723using HeuristicLab.MainForm;
    2824using HeuristicLab.MainForm.WindowsForms;
    29 using HeuristicLab.PluginInfrastructure;
    3025
    3126namespace HeuristicLab.Problems.Instances.Views {
    3227  [View("ProblemInstanceProviderView")]
    33   [Content(typeof(IProblemInstanceProvider<>), IsDefaultView = true)]
    34   public partial class ProblemInstanceProviderView<T> : AsynchronousContentView {
     28  [Content(typeof(IProblemInstanceProvider), IsDefaultView = true)]
     29  public abstract partial class ProblemInstanceProviderView : AsynchronousContentView {
    3530
    36     public new IProblemInstanceProvider<T> Content {
    37       get { return (IProblemInstanceProvider<T>)base.Content; }
     31    public new IProblemInstanceProvider Content {
     32      get { return (IProblemInstanceProvider)base.Content; }
    3833      set { base.Content = value; }
    3934    }
    4035
    41     public IProblemInstanceConsumer<T> Consumer { get; set; }
     36    public abstract IProblemInstanceConsumer Consumer { set; }
    4237
    43     public IProblemInstanceExporter<T> Exporter { get; set; }
     38    public abstract IProblemInstanceExporter Exporter { set; }
    4439
    4540    public ProblemInstanceProviderView() {
    4641      InitializeComponent();
    47       importButton.Text = String.Empty;
    48       importButton.Image = VSImageLibrary.Open;
    49       toolTip.SetToolTip(importButton, "Import a " + GetProblemType() + " instance from file.");
    50       exportButton.Text = String.Empty;
    51       exportButton.Image = VSImageLibrary.Save;
    52       toolTip.SetToolTip(exportButton, "Export a " + GetProblemType() + " instance to a file.");
    53       loadButton.Text = String.Empty;
    54       loadButton.Image = VSImageLibrary.RefreshDocument;
    55       toolTip.SetToolTip(loadButton, "Load the selected instance.");
    56     }
    57 
    58     protected override void OnContentChanged() {
    59       base.OnContentChanged();
    60       if (Content == null) {
    61         instancesComboBox.DataSource = null;
    62       } else {
    63         instancesComboBox.DisplayMember = "Name";
    64         instancesComboBox.DataSource = Content.GetDataDescriptors().ToList();
    65       }
    66     }
    67 
    68     protected override void SetEnabledStateOfControls() {
    69       base.SetEnabledStateOfControls();
    70       instancesComboBox.Enabled = !ReadOnly && !Locked && Content != null && Consumer != null;
    71       loadButton.Enabled = !ReadOnly && !Locked && Content != null && Consumer != null;
    72       exportButton.Enabled = !ReadOnly && !Locked && Content != null && Exporter != null;
    73       problemInstanceProviderSplitContainer.Panel2Collapsed = !exportButton.Enabled;
    74     }
    75 
    76     protected virtual void loadButton_Click(object sender, EventArgs e) {
    77       var descriptor = (IDataDescriptor)instancesComboBox.SelectedItem;
    78       var instance = Content.LoadData(descriptor);
    79       try {
    80         Consumer.Load(instance);
    81       }
    82       catch (Exception ex) {
    83         MessageBox.Show(String.Format("This problem does not support loading the instance {0}: {1}", descriptor.Name, Environment.NewLine + ex.Message), "Cannot load instance");
    84       }
    85     }
    86 
    87     protected virtual void importButton_Click(object sender, EventArgs e) {
    88       openFileDialog.FileName = GetProblemType() + " instance";
    89       if (openFileDialog.ShowDialog() == DialogResult.OK) {
    90         T instance = default(T);
    91         try {
    92           instance = Content.LoadData(openFileDialog.FileName);
    93         }
    94         catch (Exception ex) {
    95           MessageBox.Show(String.Format("There was an error parsing the file: {0}", Environment.NewLine + ex.Message), "Error while parsing", MessageBoxButtons.OK, MessageBoxIcon.Error);
    96           return;
    97         }
    98         try {
    99           Consumer.Load(instance);
    100         }
    101         catch (Exception ex) {
    102           MessageBox.Show(String.Format("This problem does not support loading the instance {0}: {1}", Path.GetFileName(openFileDialog.FileName), Environment.NewLine + ex.Message), "Cannot load instance");
    103         }
    104       }
    105     }
    106 
    107     protected virtual void exportButton_Click(object sender, EventArgs e) {
    108       if (saveFileDialog.ShowDialog(this) == DialogResult.OK) {
    109         try {
    110           Content.SaveData(Exporter.Export(), saveFileDialog.FileName);
    111         }
    112         catch (Exception ex) {
    113           ErrorHandling.ShowErrorDialog(this, ex);
    114         }
    115       }
    116     }
    117 
    118     private void comboBox_DataSourceChanged(object sender, EventArgs e) {
    119       var comboBox = (ComboBox)sender;
    120       if (comboBox.DataSource == null)
    121         comboBox.Items.Clear();
    122     }
    123 
    124     protected virtual string GetProblemType() {
    125       string dataTypeName = typeof(T).Name.Split(new char[] { '.' }, StringSplitOptions.RemoveEmptyEntries).Last();
    126       if (dataTypeName.EndsWith("Data"))
    127         return dataTypeName.Substring(0, dataTypeName.Length - "Data".Length);
    128       else return dataTypeName;
    12942    }
    13043  }
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/Properties/AssemblyInfo.cs

    r7682 r7683  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.4.0.0")]
    55 [assembly: AssemblyFileVersion("3.4.2.7667")]
     55[assembly: AssemblyFileVersion("3.4.2.7682")]
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3

    • Property svn:ignore
      •  

        old new  
        22bin
        33Plugin.cs
         4*.user
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs

    r7664 r7683  
    2525  public interface IProblemInstanceConsumer : IContent { }
    2626
    27   public interface IProblemInstanceConsumer<TData> {
     27  public interface IProblemInstanceConsumer<TData> : IProblemInstanceConsumer {
    2828    /// <summary>
    2929    /// Loads the given instance data.
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/IProblemInstanceExporter.cs

    r7664 r7683  
    2121
    2222namespace HeuristicLab.Problems.Instances {
    23   public interface IProblemInstanceExporter<TData> {
     23  public interface IProblemInstanceExporter { }
     24
     25  public interface IProblemInstanceExporter<TData> : IProblemInstanceExporter {
    2426    TData Export();
    2527  }
Note: See TracChangeset for help on using the changeset viewer.