Bugfix ftree to dot : handle NOT node

Author: Gaetan Renaudeau

ftree.c

@@ -15,7 +15,7 @@
  *    - if type is variable : val is the variable litteral as int value in ascii table. Exemple: x variable is 120 (btw 120=='x')
  *    - if type is operator : the operator enum value
  * left : the left child if exists
- * right : the right child if exists
+ * right : the right child if exists, unused for NOT node
  */
 struct _FunctionNode {
   NodeType type;
@@ -210,39 +210,31 @@ TruthTable* ftree_toTruthTable(FunctionTree* ftree, char* vars) {
   return table;
 }
 
-FunctionTree* ftree_simplify(FunctionTree* ftree) {
-  // TODO
-  
-  return ftree;
-}
-
 
 /**
  * id = 1 at first call
  */
-static void rec_ftree_printDot(FunctionNode* node, FILE* out, int id) {
-  int lid, rid;
+static void rec_ftree_printDot(FunctionNode* node, FILE* out) {
   if(node==0) return;
   if(node->type==NodeType_VALUE) {
-    fprintf(out, "  n%d [label=\"%d\"]\n", id, node->val);
+    fprintf(out, "  n%p [label=\"%d\"]\n", node, node->val);
   }
   else if(node->type==NodeType_VARIABLE) {
-    fprintf(out, "  n%d [label=\"%c\"]\n", id, (char)node->val);
+    fprintf(out, "  n%p [label=\"%c\"]\n", node, (char)node->val);
   }
   else if(node->type==NodeType_OPERATOR) {
-    lid = 2*id;
-    rid = 2*id+1;
-    fprintf(out, "  n%d [label=\"%c\"]\n", id, ftree_operatorToChar(node->val));
-    fprintf(out, "  n%d -- n%d\n", id, lid);
-    fprintf(out, "  n%d -- n%d\n", id, rid);
-    rec_ftree_printDot(node->left, out, lid);
-    rec_ftree_printDot(node->right, out, rid);
+    fprintf(out, "  n%p [label=\"%c\"]\n", node, ftree_operatorToChar(node->val));
+    fprintf(out, "  n%p -- n%p\n", node, node->left);
+    if(node->val != Op_NOT)
+      fprintf(out, "  n%p -- n%p\n", node, node->right);
+    rec_ftree_printDot(node->left, out);
+    rec_ftree_printDot(node->right, out);
   }
 }
 
 void ftree_printDot(FunctionTree* ftree, FILE* out) {
   fprintf(out, "## Generated by Boolean Functions v%g\n", VERSION);
   fprintf(out, "graph {\n");
-  rec_ftree_printDot(ftree->root, out, 1);
+  rec_ftree_printDot(ftree->root, out);
   fprintf(out, "}\n");
 }

ftree.h

@@ -25,8 +25,6 @@ FunctionTree* ftree_createWithNode(FunctionNode* node);
 
 FunctionTree* ftree_clone(FunctionTree* node);
 
-FunctionTree* ftree_fromExpression(char*);
-
 void ftree_free(FunctionTree*);
 
 void ftree_normalize(FunctionTree*);
@@ -45,7 +43,5 @@ FunctionNode* ftree_newBool(int b);
 FunctionNode* ftree_newVar(char s);
 FunctionTree* ftree_createWithNode(FunctionNode* node);
 
-
-FunctionTree* ftree_simplify(FunctionTree* ftree);
 #endif
 

function.c

@@ -62,8 +62,9 @@ Function* function_createWithFunctionTree(FunctionTree* tree) {
   f -> tree = tree;
   f -> vars = ftree_getVars(tree);
   f -> table = ftree_toTruthTable(tree, f->vars);
-  f -> fmd = ftree_simplify(btable_toFunctionTree(f->table, f->vars));
+  f -> fmd = (btable_toFunctionTree(f->table, f->vars));
   f -> btree = btree_simplify(btable_toBoolTree(f->table, f->vars));
+  // f -> fmd = btree_toFunctionTree(f->btree); // TODO
   return f;
 }
 
@@ -72,8 +73,9 @@ Function* function_createWithTruthTable(TruthTable* table) {
   f -> table = table;
   f -> vars = btable_generateVars(table);
   f -> tree = btable_toFunctionTree(f->table, f->vars);
-  f -> fmd = ftree_simplify(ftree_clone(f->tree));
+  f -> fmd = (ftree_clone(f->tree));
   f -> btree = btree_simplify(btable_toBoolTree(f->table, f->vars));
+  // f -> fmd = btree_toFunctionTree(f->btree); // TODO
   return f;
 }