Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/31/11 11:52:11 (13 years ago)
Author:
abeham
Message:

#1628

  • Updated branch from trunk
  • Changed ReferenceEqualityComparer<T> to become a non-generic class (generic implementation probably was only made because of lacking support for co- and contravariance in C# 3.5)
  • Added finished experiment from sample algorithms to the tests
  • Wrote a unit test to instantiate every IDeepCloneable type, clone it and compare the objects in the object graph for equal references
  • Wrote a unit test to load the experiment, clone it and compare again the objects in the object graph
  • Preliminary fix for a potential bug in ThreadSafeLog
  • Preliminary fix for a potential bug in OperatorGraphVisualizationInfo
  • Preliminary fix for a potential bug in Calculator (and added license headers)
  • Preliminary fix for a potential bug in ScrambleMove
Location:
branches/GeneralizedQAP
Files:
9 edited
6 copied

Legend:

Unmodified
Added
Removed

  • branches/GeneralizedQAP

  • branches/GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r6471 r6685  
    128128      <DependentUpon>BatchRunView.cs</DependentUpon>
    129129    </Compile>
     130    <Compile Include="RunCollectionContentConstraintView.cs">
     131      <SubType>UserControl</SubType>
     132    </Compile>
     133    <Compile Include="RunCollectionContentConstraintView.Designer.cs">
     134      <DependentUpon>RunCollectionContentConstraintView.cs</DependentUpon>
     135    </Compile>
    130136    <Compile Include="ExperimentTreeView.cs">
    131137      <SubType>UserControl</SubType>
    … …  
    152158      <DependentUpon>RunCollectionBoxPlotView.cs</DependentUpon>
    153159    </Compile>
     160    <Compile Include="RunCollectionModificationEvaluatorView.cs">
     161      <SubType>UserControl</SubType>
     162    </Compile>
     163    <Compile Include="RunCollectionModificationEvaluatorView.Designer.cs">
     164      <DependentUpon>RunCollectionModificationEvaluatorView.cs</DependentUpon>
     165    </Compile>
    154166    <Compile Include="RunCollectionComparisonConstraintView.cs">
    155167      <SubType>UserControl</SubType>
    … …  
    170182      <DependentUpon>RunCollectionConstraintCollectionView.cs</DependentUpon>
    171183    </Compile>
    172     <Compile Include="RunCollectionConstraintView.cs">
    173       <SubType>UserControl</SubType>
    174     </Compile>
    175     <Compile Include="RunCollectionConstraintView.Designer.cs">
    176       <DependentUpon>RunCollectionConstraintView.cs</DependentUpon>
     184    <Compile Include="RunCollectionColumnConstraintView.cs">
     185      <SubType>UserControl</SubType>
     186    </Compile>
     187    <Compile Include="RunCollectionColumnConstraintView.Designer.cs">
     188      <DependentUpon>RunCollectionColumnConstraintView.cs</DependentUpon>
    177189    </Compile>
    178190    <Compile Include="OptimizerListView.cs">
    … …  
    295307      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    296308      <Name>HeuristicLab.Optimization-3.3</Name>
     309    </ProjectReference>
     310    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     311      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     312      <Name>HeuristicLab.Parameters-3.3</Name>
    297313    </ProjectReference>
    298314    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">

  • branches/GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/HeuristicLabOptimizationViewsPlugin.cs.frame

    r6548 r6685  
    3838  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    3939  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     40  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    4041  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions","3.3")]
    4142  public class HeuristicLabOptimizationViewsPlugin : PluginBase {

  • branches/GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.Designer.cs

    r6558 r6685  
    6161      this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
    6262      this.openBoxPlotViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
     63      this.hideRunToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    6364      this.zoomButton = new System.Windows.Forms.RadioButton();
    6465      this.selectButton = new System.Windows.Forms.RadioButton();
    … …  
    214215      this.openBoxPlotViewToolStripMenuItem.Text = "Open BoxPlot View";
    215216      this.openBoxPlotViewToolStripMenuItem.Click += new System.EventHandler(this.openBoxPlotViewToolStripMenuItem_Click);
     217      //
     218      // hideRunToolStripMenuItem
     219      //
     220      this.hideRunToolStripMenuItem.Name = "hideRunToolStripMenuItem";
     221      this.hideRunToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
     222      this.hideRunToolStripMenuItem.Text = "Hide Run";
     223      this.hideRunToolStripMenuItem.Click += new System.EventHandler(hideRunToolStripMenuItem_Click);
    216224      //
    217225      // zoomButton
    … …  
    374382    private System.Windows.Forms.Label noRunsLabel;
    375383    private System.Windows.Forms.ToolStripMenuItem openBoxPlotViewToolStripMenuItem;
     384    private System.Windows.Forms.ToolStripMenuItem hideRunToolStripMenuItem;
    376385    private System.Windows.Forms.Button colorXAxisButton;
    377386    private System.Windows.Forms.Button colorYAxisButton;

  • branches/GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

    r6096 r6685  
    5555    public RunCollectionBubbleChartView() {
    5656      InitializeComponent();
    57       chart.ContextMenuStrip.Items.Insert(0, openBoxPlotViewToolStripMenuItem);
     57
     58      chart.ContextMenuStrip.Items.Insert(0, hideRunToolStripMenuItem);
     59      chart.ContextMenuStrip.Items.Insert(1, openBoxPlotViewToolStripMenuItem);
     60      chart.ContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(ContextMenuStrip_Opening);
    5861
    5962      runToDataPointMapping = new Dictionary<IRun, List<DataPoint>>();
    … …  
    631634    }
    632635
     636    private IRun runToHide = null;
     637    private void ContextMenuStrip_Opening(object sender, System.ComponentModel.CancelEventArgs e) {
     638      var pos = Control.MousePosition;
     639      var chartPos = chart.PointToClient(pos);
     640
     641      HitTestResult h = this.chart.HitTest(chartPos.X, chartPos.Y);
     642      if (h.ChartElementType == ChartElementType.DataPoint) {
     643        runToHide = (IRun)((DataPoint)h.Object).Tag;
     644        hideRunToolStripMenuItem.Visible = true;
     645      } else {
     646        runToHide = null;
     647        hideRunToolStripMenuItem.Visible = false;
     648      }
     649
     650    }
     651    private void hideRunToolStripMenuItem_Click(object sender, EventArgs e) {
     652      var constraint = Content.Constraints.OfType<RunCollectionContentConstraint>().Where(c => c.Active).FirstOrDefault();
     653      if (constraint == null) {
     654        constraint = new RunCollectionContentConstraint();
     655        Content.Constraints.Add(constraint);
     656        constraint.Active = true;
     657      }
     658      constraint.ConstraintData.Add(runToHide);
     659    }
     660
    633661    private void openBoxPlotViewToolStripMenuItem_Click(object sender, EventArgs e) {
    634662      RunCollectionBoxPlotView boxplotView = new RunCollectionBoxPlotView();
    … …  
    662690    }
    663691    #endregion
    664 
    665692  }
    666693}

  • branches/GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionComparisonConstraintView.cs

    r5445 r6685  
    2929namespace HeuristicLab.Optimization.Views {
    3030  [Content(typeof(RunCollectionComparisonConstraint), true)]
    31   public partial class RunCollectionComparisonConstraintView : RunCollectionConstraintView {
     31  public partial class RunCollectionComparisonConstraintView : RunCollectionColumnConstraintView {
    3232    public RunCollectionComparisonConstraintView() {
    3333      InitializeComponent();

  • branches/GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionEqualityConstraintView.cs

    r5445 r6685  
    2525namespace HeuristicLab.Optimization.Views {
    2626  [Content(typeof(RunCollectionEqualityConstraint), true)]
    27   public partial class RunCollectionEqualityConstraintView : RunCollectionConstraintView {
     27  public partial class RunCollectionEqualityConstraintView : RunCollectionColumnConstraintView {
    2828    public RunCollectionEqualityConstraintView() {
    2929      InitializeComponent();

  • branches/GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionTypeCompatibilityConstraintView.cs

    r5445 r6685  
    2525namespace HeuristicLab.Optimization.Views {
    2626  [Content(typeof(RunCollectionTypeCompatibilityConstraint), true)]
    27   public partial class RunCollectionTypeCompatibilityConstraintView : RunCollectionConstraintView {
     27  public partial class RunCollectionTypeCompatibilityConstraintView : RunCollectionColumnConstraintView {
    2828    public RunCollectionTypeCompatibilityConstraintView() {
    2929      InitializeComponent();

  • branches/GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

    r6527 r6685  
    9898        }
    9999      }
     100      var modifierMenuItem = new ToolStripMenuItem();
     101      modifierMenuItem.Text = "Modify RunCollection";
     102      modifierMenuItem.Click += ModifierMenuItem_OnClick;
     103      analyzeRunsToolStripDropDownButton.DropDownItems.Add(modifierMenuItem);
    100104    }
    101105
    … …  
    336340      }
    337341    }
     342    private void ModifierMenuItem_OnClick(object sender, EventArgs args) {
     343      var modifier = new RunCollectionModificationEvaluator();
     344      modifier.RunCollection.AddRange(Content.Select(r => (IRun)r.Clone()));
     345      MainFormManager.MainForm.ShowContent(modifier);
     346    }
    338347    private void removeButton_Click(object sender, EventArgs e) {
    339348      if (itemsListView.SelectedItems.Count > 0) {
Note: See TracChangeset for help on using the changeset viewer.