Changeset 12406 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking

Timestamp:

05/27/15 18:08:41 (10 years ago)

Author:

bburlacu

Message:

#1772: Removed obsolete FrequentFragmentsDialog, added a checkbox to select the subtree matching mode in the SymbolicDataAnalysisGenealogyGraphView, removed commented code from the SymbolicDataAnalysisPoly10Analyzer.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking

Files:

• SymbolicDataAnalysisGenealogyGraphView.Designer.cs (modified) (4 diffs)
• SymbolicDataAnalysisGenealogyGraphView.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.Designer.cs

@@ -56 +56 @@
       this.nodeQualityLabel = new System.Windows.Forms.Label();
       this.nodeQualityLabelLabel = new System.Windows.Forms.Label();
+      this.matchingModeButton = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -78 +79 @@
       // groupBox1
       // 
+      this.groupBox1.Controls.Add(this.matchingModeButton);
       this.groupBox1.Controls.Add(this.nodeWeightLabel);
       this.groupBox1.Controls.Add(this.nodeWeightLabelLabel);
@@ -183 +185 @@
       this.nodeQualityLabelLabel.Text = "Quality:";
       // 
+      // matchingModeButton
+      // 
+      this.matchingModeButton.AutoSize = true;
+      this.matchingModeButton.Checked = true;
+      this.matchingModeButton.CheckState = System.Windows.Forms.CheckState.Checked;
+      this.matchingModeButton.Location = new System.Drawing.Point(455, 18);
+      this.matchingModeButton.Name = "matchingModeButton";
+      this.matchingModeButton.Size = new System.Drawing.Size(100, 17);
+      this.matchingModeButton.TabIndex = 9;
+      this.matchingModeButton.Text = "Exact Matching";
+      this.matchingModeButton.UseVisualStyleBackColor = true;
+      // 
       // SymbolicDataAnalysisGenealogyGraphView
       // 
@@ -215 +229 @@
     private System.Windows.Forms.Label nodeWeightLabelLabel;
     private System.Windows.Forms.Label nodeWeightLabel;
+    private System.Windows.Forms.CheckBox matchingModeButton;
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.cs

@@ -183 +183 @@
         // currently there is no possibility to specify the subtree matching criteria
         var trees = Content.Vertices.Select(x => x.Data);
+        comparer.MatchVariableWeights = matchingModeButton.Checked;
+        comparer.MatchConstantValues = matchingModeButton.Checked;
         var matchingTrees = trees.Where(x => x.Root.ContainsSubtree(node, comparer));
 
@@ -197 +199 @@
 
         var trees = Content.Vertices.Select(x => x.Data);
+        comparer.MatchVariableWeights = matchingModeButton.Checked;
+        comparer.MatchConstantValues = matchingModeButton.Checked;
         var matchingTrees = trees.Where(x => x.Root.ContainsSubtree(ClonedSubtree, comparer));