X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=demos%2Ftrees.c;h=8838e3f66153cdc701b3fb7aeccb7f0dc0b590d1;hb=47e4883a12f36914d419e9e5fd1a0ff97227c093;hp=788989ee00e57f8ac5114d34c6a4a78ce98e4c6c;hpb=a68153bf02baf64e3b6cbf3da18308636beef4f3;p=svn%2FCll1h%2F.git

diff --git a/demos/trees.c b/demos/trees.c
index 788989e..8838e3f 100644
--- a/demos/trees.c
+++ b/demos/trees.c
@@ -2,7 +2,7 @@
 
 def_mem(Leaf)
 {
- int value; 
+ int seq;
  array(Leaf);
 };
 
@@ -10,10 +10,15 @@ program
 { 
  Leaf leaf,root=NULL;
  int newkey;
+ int seq=0;
+ int odd=1;
 
- for_ints(newkey,  8,1,-2,745,-32,-64,27,4 ) printf(" [%d]",i)
+ for_ints(newkey,  8,1,-2,745,-32,-64,27,4 ) 
  {
+  printf("%d. [%d]\n",seq,newkey);
+ 
   leaf=get_mem(Leaf);
+  leaf->seq=seq++;
 
   //init
   leaf->__next=NULL;
@@ -22,22 +27,57 @@ program
 
   //grow tree
   {
-    void *prev = NULL, *newleaf = leaf;
-    for(leaf=root; leaf && leaf->__key <= newkey ; leaf=leaf->__next)
+   void *prev=NULL, *newleaf=leaf;
+   //find where to store
+   for(leaf=root;leaf && leaf->__key<=newkey;leaf=leaf->__next)
+   {
+    prev=leaf;
+    if(leaf->__seek && leaf->__seek->key<=newkey)
     {
-     prev = leaf;
-     if(leaf->__seek && leaf->__seek->key <= newkey) leaf=leaf->__seek;
-    }
+     leaf=leaf->__seek;
+     
+   }
+   //store new node
+   leaf=newleaf;
+   if(prev)
+   {
+    leaf->__next=prev->__next->__next;
+    prev->__next=leaf;
+   }
+   else
+    leaf->__next=root;
     
-    if(prev)
+   //reindex B+ tree
+   for(leaf=root;leaf->__next;leaf=leaf->__next)
+   {
+    //auto seek
+    if(!leaf->__seek)
+     leaf->__seek=leaf->__next->__next;
+          
+    if(leaf->__key<=newkey)
     {
-    
-    }
+     if(leaf->__seek && leaf->__seek->__key>newkey)
+      leaf->__seek=leaf->__seek->__next;    
+    }      
     else
     {
-    
-    }
-
+     if(odd && leaf->__seek)
+     {
+      leaf->__seek==leaf->__seek->__next;
+      odd=1-odd;
+     }
+     else
+     {
+      leaf->__seek=leaf->__next->__seek;
+      leaf->__next->__seek=NULL;
+     }
+    } 
+   }
   }
- } 
+ }
+ 
+ for_each(leaf,root)
+ {
+  printf("%d. [%d]\n",leaf->seq,leaf->__key);
+ }
 }