update2 withHash

bjeanlou
1 parent d039b248
Showing 2 changed files with 71 additions and 20 deletions Show diff stats
treeh.c
treeh.h
 #include "treeh.h"
  
+//initializers & destroyer
 tree make_empty_tree(){
   return NULL;
 }
-
-void addto_tree(tree,char*,int){
-  if
-  
+node* make_empty_node(){
+  node*n=malloc(sizeof(node));
+  n->letter='\0';
+  n->isEnd=false;
+  for(int i=0;i<NBCHAR;i++)
+    n->next[i]=make_empty_tree();
+}
+node* make_node(char l,bool end){
+  node*n=malloc(sizeof(node));
+  n->letter=l;
+  n->isEnd=end;
+  for(int i=0;i<NBCHAR;i++)
+    n->next[i]=make_empty_tree();
+}
+void delete_tree(tree t){
+  if(is_empty(t))return;
+  for(int i=0;i<NBCHAR;i++)
+    delete_tree(t->next[i]);
+  free(t);
 }
-void loadfrom_file(tree,FILE*){}
-void loadfrom_keyboard(tree){}
  
-char is_empty(tree){
+
+
+//Casual functions
+bool is_empty(tree t){
+  return t==NULL;
+}
+bool is_followed(tree t){
   int i;
   for(i=0;i<NBCHAR;i++){
     if(t->next[i]!=NULL)
-      return 0;
+      return true;
   }
-  return 1;
+  return false;
 }
-char is_end(tree t){
-  return t->isEnd!=0;
+bool is_end(tree t){
+  return t->isEnd;
 }
-
 int hash(char c){
-  //needs to check c isalpha or ';
+  //needs to check c wether isalpha or '\''
   if(c='\'')
     return 0;
   return c%64;
 }
+
+
+
+//
+bool addto_tree(tree t,string s,bool isIn){
+  //recursive, when called : set isIn to true
+  //return wether s is already in t or not
+  if(s[0]=='\0'){
+    t->isEnd=true;
+    return isIn;
+  }
+  if(t->next[hash(s[0])]==NULL)
+    t->next[hash(s[0])]=make_node(s[0],false); 
+}
+void addto_tree2(tree t,string s){
+  //faster than addto_tree, used when it is knowned the word is not yet in dictionnary
+  if(s[0]=='\0'){
+    t->isEnd=true;
+    return;
+  }
+  t->next[hash(s[0])]=make_node(s[0],false);
+  addto_tree2(t->next[hash(s[0])],
+}
+void loadfrom_file(tree,FILE*){}
+void loadfrom_keyboard(tree){}
+
@@ -4,25 +4,31 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdbool.h>
  
-#define NBCHAR 27 //a-z + '
+#define NBCHAR 27 //A-Z + '
  
  
-typedef
+typedef struct _node node, *tree;
 struct node{
   char letter;
-  char isEnd;
-  node* next[NBCHAR]
-} *ptNode,*tree;
+  bool isEnd;
+  node* next[NBCHAR];
+};
  
 tree make_empty_tree();
+node* make_empty_node();
+node* make_node(char,bool);
+void delete_tree(tree);
+
+bool is_empty(tree);
+bool is_end(tree);
+bool is_followed(tree);//tells if tree has following letters
  
 void addto_tree(tree,char*,int);
 void loadfrom_file(tree,FILE*);
 void loadfrom_keyboard(tree);
  
-char is_empty(tree);
-char is_end(tree);
  
 int hash(char);