plGeoAdaptels

@@ -64,10 +64,10 @@ void grow_adaptel(int i, LABELS* labels, MINLIST* minlist, SEEDS* seeds,

     CELL cell;    

 	// get seed

-	index = seeds->seeds[i].index;

+	index = get_seed_index(seeds, i);

 	if(labels->labels[index] < 0) {

-		insert_minlist(minlist, seeds->seeds[i].x, seeds->seeds[i].y, index, 0);

+		insert_minlist(minlist, get_seed_x(seeds, i), get_seed_y(seeds, i), index, 0);

 		distances[index] = 0.0;

 		init_label(labels, index);

 		nodata = (mask[index]==1);

@@ -7,7 +7,7 @@

 #define SEEDSINCREMENT 10000000

 SEEDS* create_seeds(long MAX_SIZE) {

-	long init_size = MAX_SIZE; //SEEDSINCREMENT;

+	long init_size = SEEDSINCREMENT;

 	SEEDS* seeds = (SEEDS *)malloc(sizeof(SEEDS));

     seeds->seeds = (SEED *)malloc(init_size*sizeof(SEED));

     seeds->N = 0;

@@ -23,14 +23,14 @@ void free_seeds(SEEDS *seeds) {

 }

 void insert_seed(SEEDS *seeds, long p, int x, int y, long index) {

-    int i = seeds->N;

+    int i = seeds->N - seeds->base;

     seeds->seeds[i].x = x;

     seeds->seeds[i].y = y;

     seeds->seeds[i].index = index;

     seeds->N++;

-    if (seeds->N - seeds->base == seeds->max_size) { // to do!!!!!

-		if(p > SEEDSINCREMENT - seeds->base) {

-			memmove(&(seeds->seeds[0]),&(seeds->seeds[p - seeds->base]),(i-p)*sizeof(SEED));

+    if (seeds->N - seeds->base >= seeds->max_size) { // to do!!!!!

+		if(p  - seeds->base > SEEDSINCREMENT) {

+			memmove(&(seeds->seeds[0]),&(seeds->seeds[p - seeds->base]),(seeds->N - p)*sizeof(SEED));

 			seeds->base = p;

 		} else {

 			seeds->max_size += SEEDSINCREMENT;

@@ -41,6 +41,18 @@ void insert_seed(SEEDS *seeds, long p, int x, int y, long index) {

     }

 }

+long get_seed_index(SEEDS* seeds, long i) {

+	return seeds->seeds[i - seeds->base].index;

+}

+

+int get_seed_x(SEEDS* seeds, long i) {

+	return seeds->seeds[i - seeds->base].x;

+}

+

+int get_seed_y(SEEDS* seeds, long i) {

+	return seeds->seeds[i - seeds->base].y;

+}

+

 SEED* get_seed(SEEDS* seeds, long i) {

 	return &(seeds->seeds[i - seeds->base]);

 }

@@ -19,5 +19,9 @@ void free_seeds(SEEDS *seeds);

 void insert_seed(SEEDS *seeds, long p, 

                  int x, int y, long index);

 SEED* get_seed(SEEDS* seeds, long i);

+long get_seed_index(SEEDS* seeds, long i);

+int get_seed_x(SEEDS* seeds, long i);

+int get_seed_y(SEEDS* seeds, long i);

+

 #endif