浏览代码

clean up comments

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@44856 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 14 年之前
父节点
当前提交
56e8bf8111
共有 3 个文件被更改,包括 4 次插入7 次删除
  1. 0 1
      lib/vector/rtree/card.h
  2. 3 6
      lib/vector/rtree/indexf.c
  3. 1 0
      lib/vector/rtree/io.c

+ 0 - 1
lib/vector/rtree/card.h

@@ -30,6 +30,5 @@ extern int LEAFCARD;
 
 #define MAXKIDS(level, t) ((level) > 0 ? (t)->nodecard : (t)->leafcard)
 #define MINFILL(level, t) ((level) > 0 ? (t)->minfill_node_split : (t)->minfill_leaf_split)
-//#define MINFILL(level, t) ((level) > 0 ? (t)->nodecard * 0.4 : (t)->leafcard * 0.4)
 
 #endif

+ 3 - 6
lib/vector/rtree/indexf.c

@@ -243,7 +243,6 @@ int RTreeInsertRectF(struct Rect *r, union Child child, int level,
     for (i = 0; i < MAXLEVEL; i++)
 	overflow[i] = 1;
 
-    /* no R*-tree like forced reinsertion for file-based index ? */
     result =
 	RTreeInsertRect2F(r, child, level, &newnode, &newnode_pos, t,
 	                  &reInsertList, overflow);
@@ -258,9 +257,9 @@ int RTreeInsertRectF(struct Rect *r, union Child child, int level,
 	b.rect = RTreeNodeCover(&oldroot, t);
 	b.child.pos = t->rootpos;
 	RTreeAddBranch(&b, &newroot, NULL, NULL, NULL, NULL, t);
-	/* branch for new node created by RTreeInsertRect2F */
+	/* branch for new node created by RTreeInsertRect2F() */
 	b.rect = RTreeNodeCover(&newnode, t);
-	b.child.pos = newnode_pos;  /* offset to new node as returned by RTreeInsertRect2F */
+	b.child.pos = newnode_pos;  /* offset to new node as returned by RTreeInsertRect2F() */
 	RTreeAddBranch(&b, &newroot, NULL, NULL, NULL, NULL, t);
 	/* write new root node */
 	t->rootpos = RTreeGetNodePos(t);
@@ -290,7 +289,7 @@ int RTreeInsertRectF(struct Rect *r, union Child child, int level,
 		b.rect = RTreeNodeCover(&oldroot, t);
 		b.child.pos = t->rootpos;
 		RTreeAddBranch(&b, &newroot, NULL, NULL, NULL, NULL, t);
-		/* branch for new node created by RTreeFInsertRect2() */
+		/* branch for new node created by RTreeInsertRect2F() */
 		b.rect = RTreeNodeCover(&newnode, t);
 		b.child.pos = newnode_pos; 
 		RTreeAddBranch(&b, &newroot, NULL, NULL, NULL, NULL, t);
@@ -387,8 +386,6 @@ RTreeDeleteRect2F(struct Rect *r, union Child child, struct RTree *t,
 	    nr = RTreeNodeCover(&(s[down].sn), t);
 	    /* rewrite rect */
 	    if (!RTreeCompareRect(&nr, &(s[top].sn.branch[i].rect), t)) {
-		//s[top].sn.branch[i].rect = nr;
-		//RTreeRewriteRect(&nr, s[top].pos, i, t);
 		RTreeUpdateRect(&nr, &(s[top].sn), s[top].pos, i, t);
 	    }
 	}

+ 1 - 0
lib/vector/rtree/io.c

@@ -121,6 +121,7 @@ void RTreeUpdateRect(struct Rect *r, struct Node *n, off_t nodepos, int b, struc
     t->mru[n->level] = which;
 }
 
+/* flush pending changes to file */
 void RTreeFlushBuffer(struct RTree *t)
 {
     int i;