Changeset 14717 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariableTreeNode.cs

Timestamp:

03/06/17 16:40:33 (7 years ago)

Author:

gkronber

Message:

#2650: use a dictionary of variable values instead of a list in FactorVariable (symbol) to remove sequential search for variable value in FactorVariableTreeNode

File:

• branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariableTreeNode.cs (modified) (5 diffs)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariableTreeNode.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -51 +52 @@
       : base(original, cloner) {
       variableName = original.variableName;
-      if (original.weights != null) {
+      if(original.weights != null) {
         this.weights = new double[original.Weights.Length];
         Array.Copy(original.Weights, weights, weights.Length);
@@ -74 +75 @@
 
     public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
-      if (random.NextDouble() < 0.2) {
+      if(random.NextDouble() < 0.2) {
         VariableName = Symbol.VariableNames.SampleRandom(random);
-        if (weights.Length != Symbol.GetVariableValues(VariableName).Count()) {
+        if(weights.Length != Symbol.GetVariableValues(VariableName).Count()) {
           // if the length of the weight array does not match => re-initialize weights
           weights =
@@ -87 +88 @@
         var idx = random.Next(weights.Length);
         // 50% additive & 50% multiplicative
-        if (random.NextDouble() < 0.5) {
+        if(random.NextDouble() < 0.5) {
           double x = NormalDistributedRandom.NextDouble(random, Symbol.WeightManipulatorMu,
             Symbol.WeightManipulatorSigma);
@@ -103 +104 @@
 
     public double GetValue(string cat) {
-      // TODO: perf
-      var s = Symbol;
-      int idx = 0;
-      foreach (var val in s.GetVariableValues(VariableName)) {
-        if (cat == val) return weights[idx];
-        idx++;
-      }
-      throw new ArgumentOutOfRangeException("Found unknown value " + cat + " for variable " + VariableName);
+      return weights[Symbol.GetIndexForValue(VariableName, cat)];
     }