Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12406


Ignore:
Timestamp:
05/27/15 18:08:41 (9 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
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/HeuristicLab.EvolutionTracking.Views-3.4.csproj

    r12208 r12406  
    9797  </ItemGroup>
    9898  <ItemGroup>
    99     <Compile Include="FrequentFragmentsDialog.cs">
    100       <SubType>Form</SubType>
    101     </Compile>
    102     <Compile Include="FrequentFragmentsDialog.Designer.cs">
    103       <DependentUpon>FrequentFragmentsDialog.cs</DependentUpon>
    104     </Compile>
    10599    <Compile Include="GenealogyGraphChart.cs">
    106100      <SubType>UserControl</SubType>

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

    r12208 r12406  
    5656      this.nodeQualityLabel = new System.Windows.Forms.Label();
    5757      this.nodeQualityLabelLabel = new System.Windows.Forms.Label();
     58      this.matchingModeButton = new System.Windows.Forms.CheckBox();
    5859      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    5960      this.splitContainer.Panel1.SuspendLayout();
    … …  
    7879      // groupBox1
    7980      //
     81      this.groupBox1.Controls.Add(this.matchingModeButton);
    8082      this.groupBox1.Controls.Add(this.nodeWeightLabel);
    8183      this.groupBox1.Controls.Add(this.nodeWeightLabelLabel);
    … …  
    183185      this.nodeQualityLabelLabel.Text = "Quality:";
    184186      //
     187      // matchingModeButton
     188      //
     189      this.matchingModeButton.AutoSize = true;
     190      this.matchingModeButton.Checked = true;
     191      this.matchingModeButton.CheckState = System.Windows.Forms.CheckState.Checked;
     192      this.matchingModeButton.Location = new System.Drawing.Point(455, 18);
     193      this.matchingModeButton.Name = "matchingModeButton";
     194      this.matchingModeButton.Size = new System.Drawing.Size(100, 17);
     195      this.matchingModeButton.TabIndex = 9;
     196      this.matchingModeButton.Text = "Exact Matching";
     197      this.matchingModeButton.UseVisualStyleBackColor = true;
     198      //
    185199      // SymbolicDataAnalysisGenealogyGraphView
    186200      //
    … …  
    215229    private System.Windows.Forms.Label nodeWeightLabelLabel;
    216230    private System.Windows.Forms.Label nodeWeightLabel;
     231    private System.Windows.Forms.CheckBox matchingModeButton;
    217232  }
    218233}

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

    r12283 r12406  
    183183        // currently there is no possibility to specify the subtree matching criteria
    184184        var trees = Content.Vertices.Select(x => x.Data);
     185        comparer.MatchVariableWeights = matchingModeButton.Checked;
     186        comparer.MatchConstantValues = matchingModeButton.Checked;
    185187        var matchingTrees = trees.Where(x => x.Root.ContainsSubtree(node, comparer));
    186188
    … …  
    197199
    198200        var trees = Content.Vertices.Select(x => x.Data);
     201        comparer.MatchVariableWeights = matchingModeButton.Checked;
     202        comparer.MatchConstantValues = matchingModeButton.Checked;
    199203        var matchingTrees = trees.Where(x => x.Root.ContainsSubtree(ClonedSubtree, comparer));
    200204

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/BuildingBlockAnalyzers/SymbolicDataAnalysisPoly10Analyzer.cs

    r12318 r12406  
    169169        if (table.Rows.ContainsKey(label)) {
    170170          var row = table.Rows[label];
    171           // scale previous values according to the new max
    172           //          if (row.Values.Count > 0) {
    173           //            var values = new List<double>(row.Values);
    174           //            var m = values.Max();
    175           //            row.Values.Replace(values.Select(x => x * m / max));
    176           //          }
    177171          row.Values.Add(max > 0 ? pair.Value / max : 0);
    178172        }

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Tracking.sln

    r12017 r12406  
    186186    HideSolutionNode = FALSE
    187187  EndGlobalSection
    188   GlobalSection(Performance) = preSolution
    189     HasPerformanceSessions = true
    190   EndGlobalSection
    191188  GlobalSection(TestCaseManagementSettings) = postSolution
    192189    CategoryFile = HeuristicLab.Tracking.vsmdi
Note: See TracChangeset for help on using the changeset viewer.