[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master a1e40c8: Refactor size_t linked-list functions
|
From: |
Mohammad Akhlaghi |
|
Subject: |
[gnuastro-commits] master a1e40c8: Refactor size_t linked-list functions |
|
Date: |
Fri, 19 Aug 2016 19:54:09 +0000 (UTC) |
branch: master
commit a1e40c8c0b5298906d2eb1b6c7af2fedfe87d3f2
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>
Refactor size_t linked-list functions
Some of the size_t linked list library functions did not follow the library
naming convention, so they were corrected. The naming convention for all
libraries (a huge job!) was applied in commit 4d75eda (Rename exported
variables to follow new naming conventions).
---
lib/gnuastro/linkedlist.h | 6 ++--
lib/linkedlist.c | 15 +++++----
src/mkcatalog/args.h | 78 ++++++++++++++++++++++-----------------------
src/mkcatalog/ui.c | 78 ++++++++++++++++++++++-----------------------
src/mkprof/oneprofile.c | 4 +--
src/noisechisel/clumps.c | 12 +++----
src/noisechisel/label.c | 68 ++++++++++++++++++++++++++-------------
7 files changed, 142 insertions(+), 119 deletions(-)
diff --git a/lib/gnuastro/linkedlist.h b/lib/gnuastro/linkedlist.h
index dc8d3b5..045a950 100644
--- a/lib/gnuastro/linkedlist.h
+++ b/lib/gnuastro/linkedlist.h
@@ -164,13 +164,13 @@ struct gal_linkedlist_sll
};
void
-add_to_sll(struct gal_linkedlist_sll **list, size_t value);
+gal_linkedlist_add_to_sll(struct gal_linkedlist_sll **list, size_t value);
void
-pop_from_sll(struct gal_linkedlist_sll **list, size_t *value);
+gal_linkedlist_pop_from_sll(struct gal_linkedlist_sll **list, size_t *value);
size_t
-numinsll(struct gal_linkedlist_sll *list);
+gal_linkedlist_num_in_xsll(struct gal_linkedlist_sll *list);
void
gal_linkedlist_print_sll(struct gal_linkedlist_sll *list);
diff --git a/lib/linkedlist.c b/lib/linkedlist.c
index df2ad35..5d79777 100644
--- a/lib/linkedlist.c
+++ b/lib/linkedlist.c
@@ -398,14 +398,15 @@ gal_linkedlist_num_in_stll(struct gal_linkedlist_stll
*list)
***************** size_t ********************
****************************************************************/
void
-add_to_sll(struct gal_linkedlist_sll **list, size_t value)
+gal_linkedlist_add_to_sll(struct gal_linkedlist_sll **list, size_t value)
{
struct gal_linkedlist_sll *newnode;
errno=0;
newnode=malloc(sizeof *newnode);
if(newnode==NULL)
- error(EXIT_FAILURE, errno, "linkedlist: New element in
gal_linkedlist_sll");
+ error(EXIT_FAILURE, errno,
+ "linkedlist: New element in gal_linkedlist_sll");
newnode->v=value;
newnode->next=*list;
@@ -417,7 +418,7 @@ add_to_sll(struct gal_linkedlist_sll **list, size_t value)
void
-pop_from_sll(struct gal_linkedlist_sll **list, size_t *value)
+gal_linkedlist_pop_from_sll(struct gal_linkedlist_sll **list, size_t *value)
{
struct gal_linkedlist_sll *tmp;
tmp=*list;
@@ -431,7 +432,7 @@ pop_from_sll(struct gal_linkedlist_sll **list, size_t
*value)
size_t
-numinsll(struct gal_linkedlist_sll *list)
+gal_linkedlist_num_in_sll(struct gal_linkedlist_sll *list)
{
size_t num=0;
struct gal_linkedlist_sll *tmp;
@@ -451,7 +452,7 @@ gal_linkedlist_sll_to_array(struct gal_linkedlist_sll *list,
size_t i=0, *tf;
struct gal_linkedlist_sll *tmp;
- *num=numinsll(list);
+ *num=gal_linkedlist_num_in_sll(list);
errno=0;
*f=malloc(*num*sizeof(size_t));
@@ -651,7 +652,7 @@ gal_linkedlist_osll_into_sll(struct gal_linkedlist_osll *in,
while(in!=NULL)
{
tmp=in->next;
- add_to_sll(out, in->v);
+ gal_linkedlist_add_to_sll(out, in->v);
free(in);
in=tmp;
}
@@ -827,7 +828,7 @@ gal_linkedlist_tosll_into_sll(struct gal_linkedlist_tosll
*in,
while(in!=NULL)
{
tmp=in->next;
- add_to_sll(out, in->v);
+ gal_linkedlist_add_to_sll(out, in->v);
free(in);
in=tmp;
}
diff --git a/src/mkcatalog/args.h b/src/mkcatalog/args.h
index 2883619..5778b85 100644
--- a/src/mkcatalog/args.h
+++ b/src/mkcatalog/args.h
@@ -695,159 +695,159 @@ parse_opt(int key, char *arg, struct argp_state *state)
/* Catalog columns: */
case 'i':
- add_to_sll(&p->allcolsll, CATID);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATID);
p->up.idset=1;
break;
case 'j':
- add_to_sll(&p->allcolsll, CATHOSTOBJID);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATHOSTOBJID);
p->up.hostobjidset=1;
break;
case 'I':
- add_to_sll(&p->allcolsll, CATIDINHOSTOBJ);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATIDINHOSTOBJ);
p->up.idinhostobjset=1;
break;
case 'C':
- add_to_sll(&p->allcolsll, CATNUMCLUMPS);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATNUMCLUMPS);
p->up.numclumpsset=1;
break;
case 'a':
- add_to_sll(&p->allcolsll, CATAREA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATAREA);
p->up.areaset=1;
break;
case 513:
- add_to_sll(&p->allcolsll, CATCLUMPSAREA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSAREA);
p->up.clumpsareaset=1;
break;
case 'x':
- add_to_sll(&p->allcolsll, CATX);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATX);
p->up.xset=1;
break;
case 'y':
- add_to_sll(&p->allcolsll, CATY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATY);
p->up.yset=1;
break;
case 522:
- add_to_sll(&p->allcolsll, CATGEOX);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOX);
p->up.geoxset=1;
break;
case 523:
- add_to_sll(&p->allcolsll, CATGEOY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOY);
p->up.geoyset=1;
break;
case 507:
- add_to_sll(&p->allcolsll, CATCLUMPSX);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSX);
p->up.clumpsxset=1;
break;
case 508:
- add_to_sll(&p->allcolsll, CATCLUMPSY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSY);
p->up.clumpsyset=1;
break;
case 524:
- add_to_sll(&p->allcolsll, CATCLUMPSGEOX);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSGEOX);
p->up.clumpsgeoxset=1;
break;
case 525:
- add_to_sll(&p->allcolsll, CATCLUMPSGEOY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSGEOY);
p->up.clumpsgeoyset=1;
break;
case 'r':
- add_to_sll(&p->allcolsll, CATRA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATRA);
p->up.raset=1;
break;
case 'd':
- add_to_sll(&p->allcolsll, CATDEC);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATDEC);
p->up.decset=1;
break;
case 526:
- add_to_sll(&p->allcolsll, CATGEORA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEORA);
p->up.georaset=1;
break;
case 527:
- add_to_sll(&p->allcolsll, CATGEODEC);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEODEC);
p->up.geodecset=1;
break;
case 509:
- add_to_sll(&p->allcolsll, CATCLUMPSRA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSRA);
p->up.clumpsraset=1;
break;
case 510:
- add_to_sll(&p->allcolsll, CATCLUMPSDEC);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSDEC);
p->up.clumpsdecset=1;
break;
case 528:
- add_to_sll(&p->allcolsll, CATCLUMPSGEORA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSGEORA);
p->up.clumpsgeoraset=1;
break;
case 529:
- add_to_sll(&p->allcolsll, CATCLUMPSGEODEC);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSGEODEC);
p->up.clumpsgeodecset=1;
break;
case 'b':
- add_to_sll(&p->allcolsll, CATBRIGHTNESS);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATBRIGHTNESS);
p->up.brightnessset=1;
break;
case 511:
- add_to_sll(&p->allcolsll, CATCLUMPSBRIGHTNESS);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSBRIGHTNESS);
p->up.clumpsbrightnessset=1;
break;
case 533:
- add_to_sll(&p->allcolsll, CATNORIVERBRIGHTNESS);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATNORIVERBRIGHTNESS);
p->up.noriverbrightnessset=1;
break;
case 'm':
- add_to_sll(&p->allcolsll, CATMAGNITUDE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATMAGNITUDE);
p->up.magnitudeset=1;
break;
case 'e':
- add_to_sll(&p->allcolsll, CATMAGNITUDEERR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATMAGNITUDEERR);
p->up.magnitudeerrset=1;
break;
case 512:
- add_to_sll(&p->allcolsll, CATCLUMPSMAGNITUDE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSMAGNITUDE);
p->up.clumpsmagnitudeset=1;
break;
case 514:
- add_to_sll(&p->allcolsll, CATRIVERAVE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATRIVERAVE);
p->up.riveraveset=1;
break;
case 515:
- add_to_sll(&p->allcolsll, CATRIVERNUM);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATRIVERNUM);
p->up.rivernumset=1;
break;
case 'n':
- add_to_sll(&p->allcolsll, CATSN);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSN);
p->up.snset=1;
break;
case 505:
- add_to_sll(&p->allcolsll, CATSKY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSKY);
p->up.skyset=1;
break;
case 506:
- add_to_sll(&p->allcolsll, CATSTD);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSTD);
p->up.stdset=1;
break;
case 'A':
- add_to_sll(&p->allcolsll, CATSEMIMAJOR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSEMIMAJOR);
p->up.semimajorset=1;
break;
case 'B':
- add_to_sll(&p->allcolsll, CATSEMIMINOR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSEMIMINOR);
p->up.semiminorset=1;
break;
case 'p':
- add_to_sll(&p->allcolsll, CATPOSITIONANGLE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATPOSITIONANGLE);
p->up.positionangleset=1;
break;
case 530:
- add_to_sll(&p->allcolsll, CATGEOSEMIMAJOR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOSEMIMAJOR);
p->up.geosemimajorset=1;
break;
case 531:
- add_to_sll(&p->allcolsll, CATGEOSEMIMINOR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOSEMIMINOR);
p->up.geosemiminorset=1;
break;
case 532:
- add_to_sll(&p->allcolsll, CATGEOPOSITIONANGLE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOPOSITIONANGLE);
p->up.geopositionangleset=1;
break;
diff --git a/src/mkcatalog/ui.c b/src/mkcatalog/ui.c
index f6df921..38fef36 100644
--- a/src/mkcatalog/ui.c
+++ b/src/mkcatalog/ui.c
@@ -212,7 +212,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATID);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATID);
up->idset=1;
}
else if(strcmp(name, "hostobjid")==0)
@@ -221,7 +221,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATHOSTOBJID);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATHOSTOBJID);
up->hostobjidset=1;
}
else if(strcmp(name, "idinhostobj")==0)
@@ -230,7 +230,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATIDINHOSTOBJ);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATIDINHOSTOBJ);
up->idinhostobjset=1;
}
else if(strcmp(name, "numclumps")==0)
@@ -239,7 +239,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATNUMCLUMPS);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATNUMCLUMPS);
up->numclumpsset=1;
}
else if(strcmp(name, "area")==0)
@@ -248,7 +248,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATAREA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATAREA);
up->areaset=1;
}
else if(strcmp(name, "clumpsarea")==0)
@@ -257,7 +257,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSAREA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSAREA);
up->clumpsareaset=1;
}
else if(strcmp(name, "x")==0)
@@ -266,7 +266,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATX);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATX);
up->xset=1;
}
else if(strcmp(name, "y")==0)
@@ -275,7 +275,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATY);
up->yset=1;
}
else if(strcmp(name, "geox")==0)
@@ -284,7 +284,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATGEOX);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOX);
up->geoxset=1;
}
else if(strcmp(name, "geoy")==0)
@@ -293,7 +293,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATGEOY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOY);
up->geoyset=1;
}
else if(strcmp(name, "clumpsx")==0)
@@ -302,7 +302,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSX);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSX);
up->clumpsxset=1;
}
else if(strcmp(name, "clumpsy")==0)
@@ -311,7 +311,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSY);
up->clumpsyset=1;
}
else if(strcmp(name, "clumpsgeox")==0)
@@ -320,7 +320,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSGEOX);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSGEOX);
up->clumpsgeoxset=1;
}
else if(strcmp(name, "clumpsgeoy")==0)
@@ -329,7 +329,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSGEOY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSGEOY);
up->clumpsgeoyset=1;
}
else if(strcmp(name, "ra")==0)
@@ -338,7 +338,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATRA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATRA);
up->raset=1;
}
else if(strcmp(name, "dec")==0)
@@ -347,7 +347,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATDEC);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATDEC);
up->decset=1;
}
else if(strcmp(name, "geora")==0)
@@ -356,7 +356,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATGEORA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEORA);
up->georaset=1;
}
else if(strcmp(name, "geodec")==0)
@@ -365,7 +365,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATGEODEC);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEODEC);
up->geodecset=1;
}
else if(strcmp(name, "clumpsra")==0)
@@ -374,7 +374,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSRA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSRA);
up->clumpsraset=1;
}
else if(strcmp(name, "clumpsdec")==0)
@@ -383,7 +383,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSDEC);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSDEC);
up->clumpsdecset=1;
}
else if(strcmp(name, "clumpsgeora")==0)
@@ -392,7 +392,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSGEORA);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSGEORA);
up->clumpsgeoraset=1;
}
else if(strcmp(name, "clumpsgeodec")==0)
@@ -401,7 +401,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSGEODEC);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSGEODEC);
up->clumpsgeodecset=1;
}
else if(strcmp(name, "brightness")==0)
@@ -410,7 +410,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATBRIGHTNESS);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATBRIGHTNESS);
up->brightnessset=1;
}
else if(strcmp(name, "clumpsbrightness")==0)
@@ -419,7 +419,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSBRIGHTNESS);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSBRIGHTNESS);
p->up.clumpsbrightnessset=1;
}
else if(strcmp(name, "noriverbrightness")==0)
@@ -428,7 +428,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATNORIVERBRIGHTNESS);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATNORIVERBRIGHTNESS);
p->up.noriverbrightnessset=1;
}
else if(strcmp(name, "magnitude")==0)
@@ -437,7 +437,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATMAGNITUDE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATMAGNITUDE);
up->magnitudeset=1;
}
else if(strcmp(name, "magnitudeerr")==0)
@@ -446,7 +446,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATMAGNITUDEERR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATMAGNITUDEERR);
up->magnitudeerrset=1;
}
else if(strcmp(name, "clumpsmagnitude")==0)
@@ -455,7 +455,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATCLUMPSMAGNITUDE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATCLUMPSMAGNITUDE);
up->clumpsmagnitudeset=1;
}
else if(strcmp(name, "riverave")==0)
@@ -464,7 +464,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATRIVERAVE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATRIVERAVE);
up->riveraveset=1;
}
else if(strcmp(name, "rivernum")==0)
@@ -473,7 +473,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATRIVERNUM);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATRIVERNUM);
up->rivernumset=1;
}
else if(strcmp(name, "sn")==0)
@@ -482,7 +482,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATSN);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSN);
up->snset=1;
}
else if(strcmp(name, "sky")==0)
@@ -491,7 +491,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATSKY);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSKY);
up->skyset=1;
}
else if(strcmp(name, "std")==0)
@@ -500,7 +500,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATSTD);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSTD);
up->stdset=1;
}
else if(strcmp(name, "semimajor")==0)
@@ -509,7 +509,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATSEMIMAJOR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSEMIMAJOR);
up->semimajorset=1;
}
else if(strcmp(name, "semiminor")==0)
@@ -518,7 +518,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATSEMIMINOR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATSEMIMINOR);
up->semiminorset=1;
}
else if(strcmp(name, "positionangle")==0)
@@ -527,7 +527,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATPOSITIONANGLE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATPOSITIONANGLE);
up->positionangleset=1;
}
else if(strcmp(name, "geosemimajor")==0)
@@ -536,7 +536,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATGEOSEMIMAJOR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOSEMIMAJOR);
up->geosemimajorset=1;
}
else if(strcmp(name, "geosemiminor")==0)
@@ -545,7 +545,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATGEOSEMIMINOR);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOSEMIMINOR);
up->geosemiminorset=1;
}
else if(strcmp(name, "geopositionangle")==0)
@@ -554,7 +554,7 @@ readconfig(char *filename, struct mkcatalogparams *p)
gal_checkset_int_zero_or_one(value, &yes, name, key, SPACK,
filename, lineno);
if(!yes) continue;
- add_to_sll(&p->allcolsll, CATGEOPOSITIONANGLE);
+ gal_linkedlist_add_to_sll(&p->allcolsll, CATGEOPOSITIONANGLE);
up->geopositionangleset=1;
}
diff --git a/src/mkprof/oneprofile.c b/src/mkprof/oneprofile.c
index 2c48bfd..11f816d 100644
--- a/src/mkprof/oneprofile.c
+++ b/src/mkprof/oneprofile.c
@@ -343,7 +343,7 @@ makepixbypix(struct mkonthread *mkp)
/* Order doesn't matter any more, add all the pixels you find. */
while(Q)
{
- pop_from_sll(&Q, ind); /* ind=&p */
+ gal_linkedlist_pop_from_sll(&Q, ind); /* ind=&p */
mkp->x=(p/is1-xc)/os;
mkp->y=(p%is1-yc)/os;
r_el(mkp);
@@ -374,7 +374,7 @@ makepixbypix(struct mkonthread *mkp)
if(byt[*n]==0)
{
byt[*n]=1;
- add_to_sll(&Q, *n);
+ gal_linkedlist_add_to_sll(&Q, *n);
}
while(++n<nf);
}
diff --git a/src/noisechisel/clumps.c b/src/noisechisel/clumps.c
index eb1ddab..9579272 100644
--- a/src/noisechisel/clumps.c
+++ b/src/noisechisel/clumps.c
@@ -169,8 +169,8 @@ oversegment(struct clumpsthreadparams *ctp)
"can fix this problem. In oversegment (clumps.c) Q and "
"cleanup should be NULL but while checking the equal "
"flux regions they aren't", PACKAGE_BUGREPORT);
- add_to_sll(&Q, *pind);
- add_to_sll(&cleanup, *pind);
+ gal_linkedlist_add_to_sll(&Q, *pind);
+ gal_linkedlist_add_to_sll(&cleanup, *pind);
clab[*pind]=SEGMENTTMPCHECK;
/* Find all the pixels that have the same flux and are
@@ -178,7 +178,7 @@ oversegment(struct clumpsthreadparams *ctp)
while(Q!=NULL)
{
/* Pop an element from the queue. */
- pop_from_sll(&Q, ind);
+ gal_linkedlist_pop_from_sll(&Q, ind);
/* Check the vicinity of this pixel that was just
popped to see if it can find any already labeled
@@ -202,8 +202,8 @@ oversegment(struct clumpsthreadparams *ctp)
if( nlab == SEGMENTINIT && arr[*n] == arr[*pind] )
{
clab[*n]=SEGMENTTMPCHECK;
- add_to_sll(&cleanup, *n);
- add_to_sll(&Q, *n);
+ gal_linkedlist_add_to_sll(&cleanup, *n);
+ gal_linkedlist_add_to_sll(&Q, *n);
}
/* If this neighbour has a positive nlab, it
means that it belongs to another object, so
@@ -251,7 +251,7 @@ oversegment(struct clumpsthreadparams *ctp)
of the image and were a river pixel. */
while(cleanup!=NULL)
{
- pop_from_sll(&cleanup, &pix);
+ gal_linkedlist_pop_from_sll(&cleanup, &pix);
/* If it was on the sides of the image, it has been
changed to a river pixel. */
if(clab[pix]==SEGMENTTMPCHECK)
diff --git a/src/noisechisel/label.c b/src/noisechisel/label.c
index 8713518..81e560a 100644
--- a/src/noisechisel/label.c
+++ b/src/noisechisel/label.c
@@ -90,21 +90,21 @@ BF_concmp(unsigned char *byt, long *lab, size_t s0, size_t
s1,
if(byt[i] && !lab[i])
{
lab[i]=curlab;
- add_to_sll(&Q, i);
+ gal_linkedlist_add_to_sll(&Q, i);
while(Q!=NULL)
{
/* Pop from the queue */
- pop_from_sll(&Q, &p);
+ gal_linkedlist_pop_from_sll(&Q, &p);
/* Check the four connected neighbors: */
if(p/s1>0 && byt[p-s1] && !lab[p-s1])
- {add_to_sll(&Q, p-s1); lab[p-s1]=curlab;}
+ {gal_linkedlist_add_to_sll(&Q, p-s1); lab[p-s1]=curlab;}
if(p/s1<s0t1 && byt[p+s1] && !lab[p+s1])
- {add_to_sll(&Q, p+s1); lab[p+s1]=curlab;}
+ {gal_linkedlist_add_to_sll(&Q, p+s1); lab[p+s1]=curlab;}
if(p%s1>0 && byt[p-1] && !lab[p-1])
- {add_to_sll(&Q, p-1); lab[p-1]=curlab;}
+ {gal_linkedlist_add_to_sll(&Q, p-1); lab[p-1]=curlab;}
if(p%s1<s1t1 && byt[p+1] && !lab[p+1])
- {add_to_sll(&Q, p+1); lab[p+1]=curlab;}
+ {gal_linkedlist_add_to_sll(&Q, p+1); lab[p+1]=curlab;}
}
++curlab;
}
@@ -116,12 +116,12 @@ BF_concmp(unsigned char *byt, long *lab, size_t s0,
size_t s1,
if(byt[i] && !lab[i])
{
lab[i]=curlab;
- add_to_sll(&Q, i);
+ gal_linkedlist_add_to_sll(&Q, i);
while(Q!=NULL)
{
- pop_from_sll(&Q, &p);
+ gal_linkedlist_pop_from_sll(&Q, &p);
/* Set the counters for the corners in 8-connectivity */
counter=bl=br=tl=tr=0;
@@ -131,48 +131,70 @@ BF_concmp(unsigned char *byt, long *lab, size_t s0,
size_t s1,
{
++counter; ++bl; ++br;
if(byt[p-s1] && !lab[p-s1])
- {add_to_sll(&Q, p-s1); lab[p-s1]=curlab;}
+ {gal_linkedlist_add_to_sll(&Q, p-s1); lab[p-s1]=curlab;}
}
if(p/s1<s0t1)
{
++counter; ++tl; ++tr;
if(byt[p+s1] && !lab[p+s1])
- {add_to_sll(&Q, p+s1); lab[p+s1]=curlab;}
+ {gal_linkedlist_add_to_sll(&Q, p+s1); lab[p+s1]=curlab;}
}
if(p%s1>0)
{
++counter; ++bl; ++tl;
if(byt[p-1] && !lab[p-1])
- {add_to_sll(&Q, p-1); lab[p-1]=curlab;}
+ {gal_linkedlist_add_to_sll(&Q, p-1); lab[p-1]=curlab;}
}
if(p%s1<s1t1)
{
++counter; ++tr; ++br;
if(byt[p+1] && !lab[p+1])
- {add_to_sll(&Q, p+1); lab[p+1]=curlab;}
+ {gal_linkedlist_add_to_sll(&Q, p+1); lab[p+1]=curlab;}
}
if(counter==4) /* All four corners are in the image. */
{
if(byt[p-s1-1] && !lab[p-s1-1])
- {add_to_sll(&Q, p-s1-1); lab[p-s1-1]=curlab;}
+ {
+ gal_linkedlist_add_to_sll(&Q, p-s1-1);
+ lab[p-s1-1]=curlab;
+ }
if(byt[p-s1+1] && !lab[p-s1+1])
- {add_to_sll(&Q, p-s1+1); lab[p-s1+1]=curlab;}
+ {
+ gal_linkedlist_add_to_sll(&Q, p-s1+1);
+ lab[p-s1+1]=curlab;
+ }
if(byt[p+s1-1] && !lab[p+s1-1])
- {add_to_sll(&Q, p+s1-1); lab[p+s1-1]=curlab;}
+ {
+ gal_linkedlist_add_to_sll(&Q, p+s1-1);
+ lab[p+s1-1]=curlab;
+ }
if(byt[p+s1+1] && !lab[p+s1+1])
- {add_to_sll(&Q, p+s1+1); lab[p+s1+1]=curlab;}
+ {
+ gal_linkedlist_add_to_sll(&Q, p+s1+1);
+ lab[p+s1+1]=curlab;
+ }
}
else /* At least one corner isn't in the image. */
{
if(bl==2 && byt[p-s1-1] && !lab[p-s1-1])
- {add_to_sll(&Q, p-s1-1); lab[p-s1-1]=curlab;}
+ {
+ gal_linkedlist_add_to_sll(&Q, p-s1-1);
+ lab[p-s1-1]=curlab;
+ }
if(br==2 && byt[p-s1+1] && !lab[p-s1+1])
- {add_to_sll(&Q, p-s1+1); lab[p-s1+1]=curlab;}
+ {
+ gal_linkedlist_add_to_sll(&Q, p-s1+1);
+ lab[p-s1+1]=curlab;
+ }
if(tl==2 && byt[p+s1-1] && !lab[p+s1-1])
- {add_to_sll(&Q, p+s1-1); lab[p+s1-1]=curlab;}
+ {
+ gal_linkedlist_add_to_sll(&Q, p+s1-1);
+ lab[p+s1-1]=curlab;}
if(tr==2 && byt[p+s1+1] && !lab[p+s1+1])
- {add_to_sll(&Q, p+s1+1); lab[p+s1+1]=curlab;}
+ {
+ gal_linkedlist_add_to_sll(&Q, p+s1+1);
+ lab[p+s1+1]=curlab;}
}
}
++curlab;
@@ -210,16 +232,16 @@ BF_concomp_AdjMatrix(int *adj, size_t numside, long
**outnewlabs)
for(i=1;i<numside;++i)
if(newlabs[i]==0)
{
- add_to_sll(&Q, i);
+ gal_linkedlist_add_to_sll(&Q, i);
while(Q!=NULL)
{
- pop_from_sll(&Q, &p);
+ gal_linkedlist_pop_from_sll(&Q, &p);
if(newlabs[p]!=curlab)
{
newlabs[p]=curlab;
for(j=1;j<numside;++j)
if( adj[p*numside+j] && newlabs[j]==0 )
- add_to_sll(&Q, j);
+ gal_linkedlist_add_to_sll(&Q, j);
}
}
++curlab;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnuastro-commits] master a1e40c8: Refactor size_t linked-list functions,
Mohammad Akhlaghi <=