[cig-commits] r6083 - in long/3D/Gale/trunk/src/StGermain: . Base/Container/src

[walter at geodynamics.org]

Author: walter
Date: 2007-02-23 10:02:13 -0800 (Fri, 23 Feb 2007)
New Revision: 6083

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c
Log:
 r3334 at earth (orig r4003):  LukeHodkinson | 2007-02-11 20:08:10 -0800
 A few silly mistakes were causing ranges to be 
 incorrectly omitted.
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:4002
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:4003
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c	2007-02-23 18:02:07 UTC (rev 6082)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/RangeSet.c	2007-02-23 18:02:13 UTC (rev 6083)
@@ -118,7 +118,7 @@
 	inds = NULL;
 	RangeSet_GetIndices( self, &nInds, &inds );
 	newRangeSet = RangeSet_New();
-	RangeSet_SetIndices( self, nInds, inds );
+	RangeSet_SetIndices( newRangeSet, nInds, inds );
 	FreeArray( inds );
 
 	return (void*)newRangeSet;
@@ -156,6 +156,7 @@
 		if( curInd == nInds ) {
 			rng.end = rng.begin + 1;
 			rng.step = 1;
+			BTree_InsertNode( self->btree, &rng, sizeof(RangeSet_Range) );
 			break;
 		}
 
@@ -424,7 +425,7 @@
 	assert( self );
 	assert( self->step > 0 );
 
-	if( index < self->begin || index > self->end )
+	if( index < self->begin || index >= self->end )
 		return False;
 
 	return ((index - self->begin) % self->step) ? False : True;
@@ -582,7 +583,7 @@
 	RangeSet_Range*	a = (RangeSet_Range*)left;
 	RangeSet_Range*	b = (RangeSet_Range*)right;
 
-	if( a->begin > b->begin )
+	if( a->begin > b->end )
 		return 1;
 	else if( a->end < b->begin )
 		return -1;