Changeset 14766

Timestamp:

03/19/17 17:17:56 (8 years ago)

Author:

gkronber

Message:

#2650 reviewed and tested all analyzers and made some smaller changes

Location:

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers

Files:

• SymbolicDataAnalysisAlleleFrequencyAnalyzer.cs (modified) (1 diff)
• SymbolicDataAnalysisVariableFrequencyAnalyzer.cs (modified) (1 diff)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisAlleleFrequencyAnalyzer.cs

@@ -85 +85 @@
 
     private static string GetTextualRepresentationFromSubtreeOfDepth(ISymbolicExpressionTreeNode tree, int d) {
-      if (d == 0) return "";
+      if(d == 0) return "";
       StringBuilder builder = new StringBuilder();
       var varTreeNode = tree as VariableTreeNode;
       var constTreeNode = tree as ConstantTreeNode;
-      if (varTreeNode != null) {
+      var factorVarTreeNode = tree as FactorVariableTreeNode;
+      var binFactorVarTreeNode = tree as BinaryFactorVariableTreeNode;
+      if(varTreeNode != null) {
         builder.Append("(var " + varTreeNode.VariableName);
-      } else if (constTreeNode != null) {
+      } else if(factorVarTreeNode != null) {
+        builder.Append("(factor " + factorVarTreeNode.VariableName);
+      } else if(binFactorVarTreeNode != null) {
+        builder.Append("(factor " + binFactorVarTreeNode.VariableName + "=" + binFactorVarTreeNode.VariableValue);
+      } else if(constTreeNode != null) {
         builder.Append("(const");
       } else {
         builder.Append("(" + tree.ToString());
       }
-      for (int i = 0; i < tree.SubtreeCount; i++) {
+      for(int i = 0; i < tree.SubtreeCount; i++) {
         builder.Append(" " + GetTextualRepresentationFromSubtreeOfDepth(tree.GetSubtree(i), d - 1));
       }

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisVariableFrequencyAnalyzer.cs

@@ -186 +186 @@
       if (node is IVariableTreeNode) {
         var laggedVarTreeNode = node as LaggedVariableTreeNode;
-        var factorVarTreeNode = node as BinaryFactorVariableTreeNode;
+        var binFactorVariableTreeNode = node as BinaryFactorVariableTreeNode;
         var varConditionTreeNode = node as VariableConditionTreeNode;
         if (laggedVarTreeNode != null) {
           IncReferenceCount(references, laggedVarTreeNode.VariableName, currentLag + laggedVarTreeNode.Lag);
-        } else if (factorVarTreeNode != null) {
+        } else if (binFactorVariableTreeNode != null) {
           if (aggregateFactorVariables) {
-            IncReferenceCount(references, factorVarTreeNode.VariableName, currentLag);
+            IncReferenceCount(references, binFactorVariableTreeNode.VariableName, currentLag);
           } else {
-            IncReferenceCount(references, factorVarTreeNode.VariableName + "=" + factorVarTreeNode.VariableValue, currentLag);
+            IncReferenceCount(references, binFactorVariableTreeNode.VariableName + "=" + binFactorVariableTreeNode.VariableValue, currentLag);
           }
         } else if (varConditionTreeNode != null) {