[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master c009984: Renamed arraymanip library to array
|
From: |
Mohammad Akhlaghi |
|
Subject: |
[gnuastro-commits] master c009984: Renamed arraymanip library to array |
|
Date: |
Mon, 12 Sep 2016 11:05:21 +0000 (UTC) |
branch: master
commit c0099846e932de7757decf3f13b32fe335cdd44a
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>
Renamed arraymanip library to array
The `manip' in this library's filename, and thus all its function names,
was excessive and redundant: it just made the function names unnecessarily
long and harder to read. A simple `array' also conveys manipulation.
---
lib/Makefile.am | 8 +--
lib/{arraymanip.c => array.c} | 76 ++++++++++----------
lib/gnuastro/array.h | 157 +++++++++++++++++++++++++++++++++++++++++
lib/gnuastro/arraymanip.h | 157 -----------------------------------------
lib/mode.c | 8 +--
lib/statistics.c | 12 ++--
src/arithmetic/arithmetic.c | 38 +++++-----
src/convolve/ui.c | 8 +--
src/imgstat/ui.c | 8 +--
src/mkprof/mkprof.c | 2 +-
src/mkprof/oneprofile.c | 10 +--
src/mkprof/ui.c | 4 +-
src/noisechisel/clumps.c | 4 +-
src/noisechisel/detection.c | 10 +--
src/noisechisel/noisechisel.c | 6 +-
src/noisechisel/ui.c | 2 +-
src/subtractsky/subtractsky.c | 6 +-
src/subtractsky/ui.c | 2 +-
18 files changed, 259 insertions(+), 259 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3923e59..7a86d16 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -30,8 +30,8 @@ lib_LTLIBRARIES = libgnuastro.la
# Specify the library .c files
-libgnuastro_la_SOURCES = arraymanip.c box.c checkset.c configfiles.c \
- fits.c gnuastro.c linkedlist.c mesh.c mode.c polygon.c qsort.c \
+libgnuastro_la_SOURCES = array.c box.c checkset.c configfiles.c fits.c \
+ gnuastro.c linkedlist.c mesh.c mode.c polygon.c qsort.c \
spatialconvolve.c statistics.c threads.c timing.c txtarray.c wcs.c
@@ -39,10 +39,10 @@ libgnuastro_la_SOURCES = arraymanip.c box.c checkset.c
configfiles.c \
# `.h' files in the $(headersdir) directory. Some of the header files don't
# need to be installed.
headersdir=$(top_srcdir)/lib/gnuastro
-pkginclude_HEADERS = $(headersdir)/arraymanip.h $(headersdir)/box.h \
+pkginclude_HEADERS = $(headersdir)/array.h $(headersdir)/box.h \
$(headersdir)/checkset.h $(headersdir)/configfiles.h \
$(headersdir)/fits.h $(headersdir)/gnuastro.h $(headersdir)/linkedlist.h \
$(headersdir)/mesh.h $(headersdir)/mode.h $(headersdir)/polygon.h \
- $(headersdir)/qsort.h $(headersdir)/spatialconvolve.h \
+ $(headersdir)/qsort.h $(headersdir)/spatialconvolve.h
\
$(headersdir)/statistics.h $(headersdir)/threads.h \
$(headersdir)/timing.h $(headersdir)/txtarray.h $(headersdir)/wcs.h
diff --git a/lib/arraymanip.c b/lib/array.c
similarity index 71%
rename from lib/arraymanip.c
rename to lib/array.c
index 5e8583e..8c897c0 100644
--- a/lib/arraymanip.c
+++ b/lib/array.c
@@ -30,7 +30,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <assert.h>
#include <pthread.h>
-#include <gnuastro/arraymanip.h>
+#include <gnuastro/array.h>
@@ -39,9 +39,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
********************** Initialize **********************
*********************************************************************/
void
-gal_arraymanip_uchar_init_on_region(unsigned char *in, const unsigned char v,
- size_t start, size_t s0, size_t s1,
- size_t is1)
+gal_array_uchar_init_on_region(unsigned char *in, const unsigned char v,
+ size_t start, size_t s0, size_t s1,
+ size_t is1)
{
size_t r;
unsigned char *p, *fp;
@@ -60,7 +60,7 @@ gal_arraymanip_uchar_init_on_region(unsigned char *in, const
unsigned char v,
void
-gal_arraymanip_long_init(long *in, size_t size, const long v)
+gal_array_long_init(long *in, size_t size, const long v)
{
long *end=in+size;
do *in++=v; while(in<end);
@@ -71,8 +71,8 @@ gal_arraymanip_long_init(long *in, size_t size, const long v)
void
-gal_arraymanip_long_init_on_region(long *in, const long v, size_t start,
- size_t s0, size_t s1, size_t is1)
+gal_array_long_init_on_region(long *in, const long v, size_t start,
+ size_t s0, size_t s1, size_t is1)
{
size_t r;
long *p, *fp;
@@ -110,7 +110,7 @@ gal_arraymanip_long_init_on_region(long *in, const long v,
size_t start,
********************** Copy array **********************
*********************************************************************/
void
-gal_arraymanip_uchar_copy(unsigned char *in, size_t size, unsigned char **out)
+gal_array_uchar_copy(unsigned char *in, size_t size, unsigned char **out)
{
unsigned char *fp=in+size, *o;
@@ -126,7 +126,7 @@ gal_arraymanip_uchar_copy(unsigned char *in, size_t size,
unsigned char **out)
void
-gal_arraymanip_float_copy(float *in, size_t size, float **out)
+gal_array_float_copy(float *in, size_t size, float **out)
{
float *fp=in+size, *o;
@@ -142,7 +142,7 @@ gal_arraymanip_float_copy(float *in, size_t size, float
**out)
void
-gal_arraymanip_float_copy_values(float *in, size_t size, float **out)
+gal_array_float_copy_values(float *in, size_t size, float **out)
{
float *fp=in+size, *o=*out;
do *o++=*in; while(++in<fp);
@@ -171,7 +171,7 @@ gal_arraymanip_float_copy_values(float *in, size_t size,
float **out)
********************** Values **********************
*********************************************************************/
void
-gal_arraymanip_fset_const(float *in, size_t size, float a)
+gal_array_fset_const(float *in, size_t size, float a)
{
float *fpt;
fpt=in+size;
@@ -185,7 +185,7 @@ gal_arraymanip_fset_const(float *in, size_t size, float a)
void
-gal_arraymanip_freplace_value(float *in, size_t size, float from, float to)
+gal_array_freplace_value(float *in, size_t size, float from, float to)
{
float *fpt;
fpt=in+size;
@@ -208,7 +208,7 @@ gal_arraymanip_freplace_value(float *in, size_t size, float
from, float to)
/* Only replace non-NaN values in a float array. */
void
-gal_arraymanip_freplace_nonnans(float *in, size_t size, float to)
+gal_array_freplace_nonnans(float *in, size_t size, float to)
{
float *fpt=in+size;
do
@@ -224,7 +224,7 @@ gal_arraymanip_freplace_nonnans(float *in, size_t size,
float to)
array so that the non-NaN alements are contiguous. This is useful
for cases where you want to sort the data.*/
void
-gal_arraymanip_no_nans(float *in, size_t *size)
+gal_array_no_nans(float *in, size_t *size)
{
size_t outsize=0;
float *f=in, *fp=in+*size;
@@ -243,7 +243,7 @@ gal_arraymanip_no_nans(float *in, size_t *size)
void
-gal_arraymanip_no_nans_double(double *in, size_t *size)
+gal_array_no_nans_double(double *in, size_t *size)
{
size_t outsize=0;
double *f=in, *fp=in+*size;
@@ -262,8 +262,8 @@ gal_arraymanip_no_nans_double(double *in, size_t *size)
void
-gal_arraymanip_uchar_replace(unsigned char *in, size_t size,
- unsigned char from, unsigned char to)
+gal_array_uchar_replace(unsigned char *in, size_t size,
+ unsigned char from, unsigned char to)
{
unsigned char *fpt=in+size;
do
@@ -293,7 +293,7 @@ gal_arraymanip_uchar_replace(unsigned char *in, size_t size,
********************** Multiply or Sum with **********************
*********************************************************************/
void
-gal_arraymanip_fmultip_const(float *in, size_t size, float a)
+gal_array_fmultip_const(float *in, size_t size, float a)
{
float *fpt;
fpt=in+size;
@@ -307,7 +307,7 @@ gal_arraymanip_fmultip_const(float *in, size_t size, float
a)
void
-gal_arraymanip_fsum_const(float *in, size_t size, float a)
+gal_array_fsum_const(float *in, size_t size, float a)
{
float *fpt;
fpt=in+size;
@@ -321,15 +321,15 @@ gal_arraymanip_fsum_const(float *in, size_t size, float a)
float *
-gal_arraymanip_fsum_arrays(float *in1, float *in2, size_t size)
+gal_array_fsum_arrays(float *in1, float *in2, size_t size)
{
float *out, *o, *op;
errno=0;
o=out=malloc(size*sizeof *out);
if(out==NULL)
- error(EXIT_FAILURE, errno, "%lu bytes for out in
gal_arraymanip_fsum_arrays"
- " (arraymanip.c)", size*sizeof *out);
+ error(EXIT_FAILURE, errno, "%lu bytes for out in gal_array_fsum_arrays"
+ " (array.c)", size*sizeof *out);
op=o+size;
do *o = *in1++ + *in2++; while(++o<op);
@@ -342,7 +342,7 @@ gal_arraymanip_fsum_arrays(float *in1, float *in2, size_t
size)
void
-gal_arraymanip_dmultip_const(double *in, size_t size, double a)
+gal_array_dmultip_const(double *in, size_t size, double a)
{
double *dpt;
dpt=in+size;
@@ -353,7 +353,7 @@ gal_arraymanip_dmultip_const(double *in, size_t size,
double a)
void
-gal_arraymanip_dmultip_arrays(double *in1, double *in2, size_t size)
+gal_array_dmultip_arrays(double *in1, double *in2, size_t size)
{
double *dpt;
dpt=in1+size;
@@ -365,7 +365,7 @@ gal_arraymanip_dmultip_arrays(double *in1, double *in2,
size_t size)
void
-gal_arraymanip_ddivide_const(double *in, size_t size, double a)
+gal_array_ddivide_const(double *in, size_t size, double a)
{
double *dpt;
dpt=in+size;
@@ -377,7 +377,7 @@ gal_arraymanip_ddivide_const(double *in, size_t size,
double a)
void
-gal_arraymanip_dconst_divide(double *in, size_t size, double a)
+gal_array_dconst_divide(double *in, size_t size, double a)
{
double *dpt;
dpt=in+size;
@@ -388,7 +388,7 @@ gal_arraymanip_dconst_divide(double *in, size_t size,
double a)
void
-gal_arraymanip_ddivide_arrays(double *in1, double *in2, size_t size)
+gal_array_ddivide_arrays(double *in1, double *in2, size_t size)
{
double *dpt;
dpt=in1+size;
@@ -399,7 +399,7 @@ gal_arraymanip_ddivide_arrays(double *in1, double *in2,
size_t size)
void
-gal_arraymanip_dsum_const(double *in, size_t size, double a)
+gal_array_dsum_const(double *in, size_t size, double a)
{
double *dpt;
dpt=in+size;
@@ -411,7 +411,7 @@ gal_arraymanip_dsum_const(double *in, size_t size, double a)
void
-gal_arraymanip_dsum_arrays(double *in1, double *in2, size_t size)
+gal_array_dsum_arrays(double *in1, double *in2, size_t size)
{
double *dpt;
dpt=in1+size;
@@ -421,7 +421,7 @@ gal_arraymanip_dsum_arrays(double *in1, double *in2, size_t
size)
void
-gal_arraymanip_dsubtract_const(double *in, size_t size, double a)
+gal_array_dsubtract_const(double *in, size_t size, double a)
{
double *dpt;
dpt=in+size;
@@ -433,7 +433,7 @@ gal_arraymanip_dsubtract_const(double *in, size_t size,
double a)
void
-gal_arraymanip_dconst_subtract(double *in, size_t size, double a)
+gal_array_dconst_subtract(double *in, size_t size, double a)
{
double *dpt;
dpt=in+size;
@@ -445,7 +445,7 @@ gal_arraymanip_dconst_subtract(double *in, size_t size,
double a)
void
-gal_arraymanip_dsubtract_arrays(double *in1, double *in2, size_t size)
+gal_array_dsubtract_arrays(double *in1, double *in2, size_t size)
{
double *dpt;
dpt=in1+size;
@@ -455,7 +455,7 @@ gal_arraymanip_dsubtract_arrays(double *in1, double *in2,
size_t size)
void
-gal_arraymanip_dpower_const(double *in, size_t size, double a)
+gal_array_dpower_const(double *in, size_t size, double a)
{
double *dpt;
dpt=in+size;
@@ -472,7 +472,7 @@ gal_arraymanip_dpower_const(double *in, size_t size, double
a)
void
-gal_arraymanip_dconst_power(double *in, size_t size, double a)
+gal_array_dconst_power(double *in, size_t size, double a)
{
double *dpt;
dpt=in+size;
@@ -484,7 +484,7 @@ gal_arraymanip_dconst_power(double *in, size_t size, double
a)
void
-gal_arraymanip_dpower_arrays(double *in1, double *in2, size_t size)
+gal_array_dpower_arrays(double *in1, double *in2, size_t size)
{
double *dpt;
dpt=in1+size;
@@ -496,7 +496,7 @@ gal_arraymanip_dpower_arrays(double *in1, double *in2,
size_t size)
void
-gal_arraymanip_dlog_array(double *in, size_t size)
+gal_array_dlog_array(double *in, size_t size)
{
double *dpt;
dpt=in+size;
@@ -509,7 +509,7 @@ gal_arraymanip_dlog_array(double *in, size_t size)
void
-gal_arraymanip_dlog10_array(double *in, size_t size)
+gal_array_dlog10_array(double *in, size_t size)
{
double *dpt;
dpt=in+size;
@@ -522,7 +522,7 @@ gal_arraymanip_dlog10_array(double *in, size_t size)
void
-gal_arraymanip_dabs_array(double *in, size_t size)
+gal_array_dabs_array(double *in, size_t size)
{
double *dpt;
dpt=in+size;
diff --git a/lib/gnuastro/array.h b/lib/gnuastro/array.h
new file mode 100644
index 0000000..2eaa9f9
--- /dev/null
+++ b/lib/gnuastro/array.h
@@ -0,0 +1,157 @@
+/*********************************************************************
+Functions to manipulate arrays.
+This is part of GNU Astronomy Utilities (Gnuastro) package.
+
+Original author:
+ Mohammad Akhlaghi <address@hidden>
+Contributing author(s):
+Copyright (C) 2015, Free Software Foundation, Inc.
+
+Gnuastro is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+Gnuastro is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+**********************************************************************/
+#ifndef __GAL_ARRAY_H__
+#define __GAL_ARRAY_H__
+
+/* Include other headers if necessary here. Note that other header files
+ must be included before the C++ preparations below */
+
+
+
+/* C++ Preparations */
+#undef __BEGIN_C_DECLS
+#undef __END_C_DECLS
+#ifdef __cplusplus
+# define __BEGIN_C_DECLS extern "C" {
+# define __END_C_DECLS }
+#else
+# define __BEGIN_C_DECLS /* empty */
+# define __END_C_DECLS /* empty */
+#endif
+/* End of C++ preparations */
+
+
+
+/* Actual header contants (the above were for the Pre-processor). */
+__BEGIN_C_DECLS /* From C++ preparations */
+
+
+
+void
+gal_array_uchar_init_on_region(unsigned char *in, const unsigned char v,
+ size_t start, size_t s0, size_t s1,
+ size_t is1);
+
+void
+gal_array_long_init(long *in, size_t size, const long v);
+
+void
+gal_array_long_init_on_region(long *in, const long v, size_t start,
+ size_t s0, size_t s1, size_t is1);
+
+void
+gal_array_uchar_copy(unsigned char *in, size_t size, unsigned char **out);
+
+void
+gal_array_float_copy(float *in, size_t size, float **out);
+
+void
+gal_array_float_copy_values(float *in, size_t size, float **out);
+
+void
+gal_array_fset_const(float *in, size_t size, float a);
+
+void
+gal_array_freplace_value(float *in, size_t size, float from, float to);
+
+void
+gal_array_freplace_nonnans(float *in, size_t size, float to);
+
+void
+gal_array_no_nans(float *in, size_t *size);
+
+void
+gal_array_no_nans_double(double *in, size_t *size);
+
+void
+gal_array_uchar_replace(unsigned char *in, size_t size,
+ unsigned char from, unsigned char to);
+
+void
+gal_array_fmultip_const(float *in, size_t size, float a);
+
+void
+gal_array_fsum_const(float *in, size_t size, float a);
+
+float *
+gal_array_fsum_arrays(float *in1, float *in2, size_t size);
+
+
+void
+gal_array_dmultip_const(double *in, size_t size, double a);
+
+void
+gal_array_dmultip_arrays(double *in1, double *in2, size_t size);
+
+
+void
+gal_array_ddivide_const(double *in, size_t size, double a);
+
+void
+gal_array_dconst_divide(double *in, size_t size, double a);
+
+void
+gal_array_ddivide_arrays(double *in1, double *in2, size_t size);
+
+
+void
+gal_array_dsum_const(double *in, size_t size, double a);
+
+void
+gal_array_dsum_arrays(double *in1, double *in2, size_t size);
+
+
+void
+gal_array_dsubtract_const(double *in, size_t size, double a);
+
+void
+gal_array_dconst_subtract(double *in, size_t size, double a);
+
+void
+gal_array_dsubtract_arrays(double *in1, double *in2, size_t size);
+
+
+void
+gal_array_dpower_const(double *in, size_t size, double a);
+
+void
+gal_array_dconst_power(double *in, size_t size, double a);
+
+void
+gal_array_dpower_arrays(double *in1, double *in2, size_t size);
+
+
+void
+gal_array_dlog_array(double *in1, size_t size);
+
+void
+gal_array_dlog10_array(double *in1, size_t size);
+
+void
+gal_array_dabs_array(double *in1, size_t size);
+
+
+
+__END_C_DECLS /* From C++ preparations */
+
+#endif /* __GAL_ARRAY_H__ */
diff --git a/lib/gnuastro/arraymanip.h b/lib/gnuastro/arraymanip.h
deleted file mode 100644
index 79b747a..0000000
--- a/lib/gnuastro/arraymanip.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*********************************************************************
-Functions to manipulate arrays.
-This is part of GNU Astronomy Utilities (Gnuastro) package.
-
-Original author:
- Mohammad Akhlaghi <address@hidden>
-Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
-
-Gnuastro is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation, either version 3 of the License, or (at your
-option) any later version.
-
-Gnuastro is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
-**********************************************************************/
-#ifndef __GAL_ARRAYMANIP_H__
-#define __GAL_ARRAYMANIP_H__
-
-/* Include other headers if necessary here. Note that other header files
- must be included before the C++ preparations below */
-
-
-
-/* C++ Preparations */
-#undef __BEGIN_C_DECLS
-#undef __END_C_DECLS
-#ifdef __cplusplus
-# define __BEGIN_C_DECLS extern "C" {
-# define __END_C_DECLS }
-#else
-# define __BEGIN_C_DECLS /* empty */
-# define __END_C_DECLS /* empty */
-#endif
-/* End of C++ preparations */
-
-
-
-/* Actual header contants (the above were for the Pre-processor). */
-__BEGIN_C_DECLS /* From C++ preparations */
-
-
-
-void
-gal_arraymanip_uchar_init_on_region(unsigned char *in, const unsigned char v,
- size_t start, size_t s0, size_t s1,
- size_t is1);
-
-void
-gal_arraymanip_long_init(long *in, size_t size, const long v);
-
-void
-gal_arraymanip_long_init_on_region(long *in, const long v, size_t start,
- size_t s0, size_t s1, size_t is1);
-
-void
-gal_arraymanip_uchar_copy(unsigned char *in, size_t size, unsigned char **out);
-
-void
-gal_arraymanip_float_copy(float *in, size_t size, float **out);
-
-void
-gal_arraymanip_float_copy_values(float *in, size_t size, float **out);
-
-void
-gal_arraymanip_fset_const(float *in, size_t size, float a);
-
-void
-gal_arraymanip_freplace_value(float *in, size_t size, float from, float to);
-
-void
-gal_arraymanip_freplace_nonnans(float *in, size_t size, float to);
-
-void
-gal_arraymanip_no_nans(float *in, size_t *size);
-
-void
-gal_arraymanip_no_nans_double(double *in, size_t *size);
-
-void
-gal_arraymanip_uchar_replace(unsigned char *in, size_t size,
- unsigned char from, unsigned char to);
-
-void
-gal_arraymanip_fmultip_const(float *in, size_t size, float a);
-
-void
-gal_arraymanip_fsum_const(float *in, size_t size, float a);
-
-float *
-gal_arraymanip_fsum_arrays(float *in1, float *in2, size_t size);
-
-
-void
-gal_arraymanip_dmultip_const(double *in, size_t size, double a);
-
-void
-gal_arraymanip_dmultip_arrays(double *in1, double *in2, size_t size);
-
-
-void
-gal_arraymanip_ddivide_const(double *in, size_t size, double a);
-
-void
-gal_arraymanip_dconst_divide(double *in, size_t size, double a);
-
-void
-gal_arraymanip_ddivide_arrays(double *in1, double *in2, size_t size);
-
-
-void
-gal_arraymanip_dsum_const(double *in, size_t size, double a);
-
-void
-gal_arraymanip_dsum_arrays(double *in1, double *in2, size_t size);
-
-
-void
-gal_arraymanip_dsubtract_const(double *in, size_t size, double a);
-
-void
-gal_arraymanip_dconst_subtract(double *in, size_t size, double a);
-
-void
-gal_arraymanip_dsubtract_arrays(double *in1, double *in2, size_t size);
-
-
-void
-gal_arraymanip_dpower_const(double *in, size_t size, double a);
-
-void
-gal_arraymanip_dconst_power(double *in, size_t size, double a);
-
-void
-gal_arraymanip_dpower_arrays(double *in1, double *in2, size_t size);
-
-
-void
-gal_arraymanip_dlog_array(double *in1, size_t size);
-
-void
-gal_arraymanip_dlog10_array(double *in1, size_t size);
-
-void
-gal_arraymanip_dabs_array(double *in1, size_t size);
-
-
-
-__END_C_DECLS /* From C++ preparations */
-
-#endif /* __GAL_ARRAYMANIP_H__ */
diff --git a/lib/mode.c b/lib/mode.c
index b226737..432bd6e 100644
--- a/lib/mode.c
+++ b/lib/mode.c
@@ -30,7 +30,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/mode.h>
-#include <gnuastro/arraymanip.h>
+#include <gnuastro/array.h>
#include <gnuastro/statistics.h>
@@ -115,7 +115,7 @@ gal_mode_make_mirror_plots(float *sorted, size_t size,
size_t mirrorindex,
/* Find the index of the mirror and make the mirror array: */
mf=sorted[mirrorindex];
- gal_arraymanip_float_copy(sorted, size, &actual);
+ gal_array_float_copy(sorted, size, &actual);
makemirrored(sorted, mirrorindex, &mirror, &msize);
@@ -131,8 +131,8 @@ gal_mode_make_mirror_plots(float *sorted, size_t size,
size_t mirrorindex,
/* set the mirror pixel to have the value of zero.*/
min-=mf;
max-=mf;
- gal_arraymanip_fsum_const(actual, size, -1.0f*mf);
- gal_arraymanip_fsum_const(mirror, msize, -1.0f*mf);
+ gal_array_fsum_const(actual, size, -1.0f*mf);
+ gal_array_fsum_const(mirror, msize, -1.0f*mf);
/* Allocate space for the 3 column array keeping the histograms:*/
diff --git a/lib/statistics.c b/lib/statistics.c
index b6a0b81..96d694c 100644
--- a/lib/statistics.c
+++ b/lib/statistics.c
@@ -31,8 +31,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/qsort.h>
+#include <gnuastro/array.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/arraymanip.h>
@@ -786,8 +786,8 @@ gal_statistics_median(float *array, size_t insize)
/* Make a copy of the input, shift all its non-NaN elements to the
start of the array, then sort them and find the median. */
- gal_arraymanip_float_copy(array, insize, ©);
- gal_arraymanip_no_nans(copy, &size);
+ gal_array_float_copy(array, insize, ©);
+ gal_array_no_nans(copy, &size);
medind=gal_statistics_index_from_quantile(size, 0.5);
qsort(copy, size, sizeof*copy, gal_qsort_float_increasing);
median=copy[medind];
@@ -808,7 +808,7 @@ gal_statistics_median_double_in_place(double *array, size_t
insize)
/* Shift all its non-NaN elements to the start of the array, then
sort them and find the median. */
- gal_arraymanip_no_nans_double(array, &size);
+ gal_array_no_nans_double(array, &size);
/* If all the elements are NaN (size==0), then return NaN,
otherwise, find the median. */
@@ -1182,7 +1182,7 @@ gal_statistics_sigma_clip_converge(float *array, int
o1_n0, size_t num_elem,
if(o1_n0==0)
{
- gal_arraymanip_float_copy(array, num_elem, &orderedarray);
+ gal_array_float_copy(array, num_elem, &orderedarray);
qsort(orderedarray, num_elem, sizeof*orderedarray,
gal_qsort_float_increasing);
}
@@ -1256,7 +1256,7 @@ gal_statistics_sigma_clip_certain_num(float *array, int
o1_n0, size_t num_elem,
if(o1_n0==0)
{
- gal_arraymanip_float_copy(array, num_elem, &orderedarray);
+ gal_array_float_copy(array, num_elem, &orderedarray);
qsort(orderedarray, num_elem, sizeof*orderedarray,
gal_qsort_float_increasing);
}
diff --git a/src/arithmetic/arithmetic.c b/src/arithmetic/arithmetic.c
index 6aa0283..9b17066 100644
--- a/src/arithmetic/arithmetic.c
+++ b/src/arithmetic/arithmetic.c
@@ -30,8 +30,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/fits.h>
+#include <gnuastro/array.h>
#include <gnuastro/checkset.h>
-#include <gnuastro/arraymanip.h>
#include <gnuastro/statistics.h>
#include "main.h"
@@ -213,7 +213,7 @@ sum(struct imgarithparams *p)
{
/* Do the operation, note that the output is stored in the first
input. */
- gal_arraymanip_dsum_arrays(farr, sarr, size);
+ gal_array_dsum_arrays(farr, sarr, size);
/* Push the output onto the stack. */
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
@@ -223,12 +223,12 @@ sum(struct imgarithparams *p)
}
else if(farr) /* Only the first is an array. */
{
- gal_arraymanip_dsum_const(farr, size, snum);
+ gal_array_dsum_const(farr, size, snum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
}
else if(sarr) /* Only the first is an array. */
{
- gal_arraymanip_dsum_const(sarr, size, fnum);
+ gal_array_dsum_const(sarr, size, fnum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, sarr);
}
else /* Both are numbers. */
@@ -264,7 +264,7 @@ subtract(struct imgarithparams *p)
input. Also note that since the linked list is
first-in-first-out, the second operand should be put first
here. */
- gal_arraymanip_dsubtract_arrays(sarr, farr, size);
+ gal_array_dsubtract_arrays(sarr, farr, size);
/* Push the output onto the stack. */
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, sarr);
@@ -274,12 +274,12 @@ subtract(struct imgarithparams *p)
}
else if(farr) /* Only the first is an array. */
{
- gal_arraymanip_dconst_subtract(farr, size, snum);
+ gal_array_dconst_subtract(farr, size, snum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
}
else if(sarr) /* Only the first is an array. */
{
- gal_arraymanip_dsubtract_const(sarr, size, fnum);
+ gal_array_dsubtract_const(sarr, size, fnum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, sarr);
}
else /* Both are numbers. */
@@ -311,7 +311,7 @@ multiply(struct imgarithparams *p)
if(farr && sarr) /* Both are arrays. */
{
/* Do the operation, note that the output is stored in farr. */
- gal_arraymanip_dmultip_arrays(farr, sarr, size);
+ gal_array_dmultip_arrays(farr, sarr, size);
/* Push the output onto the stack. */
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
@@ -321,12 +321,12 @@ multiply(struct imgarithparams *p)
}
else if(farr) /* Only the first is an array. */
{
- gal_arraymanip_dmultip_const(farr, size, snum);
+ gal_array_dmultip_const(farr, size, snum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
}
else if(sarr) /* Only the first is an array. */
{
- gal_arraymanip_dmultip_const(sarr, size, fnum);
+ gal_array_dmultip_const(sarr, size, fnum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, sarr);
}
else /* Both are numbers. */
@@ -361,7 +361,7 @@ divide(struct imgarithparams *p)
input. Also note that since the linked list is
first-in-first-out, the second operand should be put first
here. */
- gal_arraymanip_ddivide_arrays(sarr, farr, size);
+ gal_array_ddivide_arrays(sarr, farr, size);
/* Push the output onto the stack. */
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, sarr);
@@ -371,12 +371,12 @@ divide(struct imgarithparams *p)
}
else if(farr) /* Only the first is an array. */
{
- gal_arraymanip_dconst_divide(farr, size, snum);
+ gal_array_dconst_divide(farr, size, snum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
}
else if(sarr) /* Only the first is an array. */
{
- gal_arraymanip_ddivide_const(sarr, size, fnum);
+ gal_array_ddivide_const(sarr, size, fnum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, sarr);
}
else /* Both are numbers. */
@@ -412,7 +412,7 @@ topower(struct imgarithparams *p, char *op)
input. Also note that since the linked list is
first-in-first-out, the second operand should be put first
here. */
- gal_arraymanip_dpower_arrays(sarr, farr, size);
+ gal_array_dpower_arrays(sarr, farr, size);
/* Push the output onto the stack. */
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, sarr);
@@ -423,12 +423,12 @@ topower(struct imgarithparams *p, char *op)
}
else if(farr) /* Only the first is an array. */
{
- gal_arraymanip_dconst_power(farr, size, snum);
+ gal_array_dconst_power(farr, size, snum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
}
else if(sarr) /* Only the first is an array. */
{
- gal_arraymanip_dpower_const(sarr, size, fnum);
+ gal_array_dpower_const(sarr, size, fnum);
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, sarr);
}
else /* Both are numbers. */
@@ -608,7 +608,7 @@ takelog(struct imgarithparams *p)
input. Also note that since the linked list is
first-in-first-out, the second operand should be put first
here. */
- gal_arraymanip_dlog_array(farr, p->s0*p->s1);
+ gal_array_dlog_array(farr, p->s0*p->s1);
/* Push the output onto the stack. */
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
@@ -637,7 +637,7 @@ takelog10(struct imgarithparams *p)
input. Also note that since the linked list is
first-in-first-out, the second operand should be put first
here. */
- gal_arraymanip_dlog10_array(farr, p->s0*p->s1);
+ gal_array_dlog10_array(farr, p->s0*p->s1);
/* Push the output onto the stack. */
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
@@ -666,7 +666,7 @@ takeabs(struct imgarithparams *p)
input. Also note that since the linked list is
first-in-first-out, the second operand should be put first
here. */
- gal_arraymanip_dabs_array(farr, p->s0*p->s1);
+ gal_array_dabs_array(farr, p->s0*p->s1);
/* Push the output onto the stack. */
add_operand(p, NOOPTFILENAME, NOOPTNUMBER, farr);
diff --git a/src/convolve/ui.c b/src/convolve/ui.c
index 470cb99..a4ab56c 100644
--- a/src/convolve/ui.c
+++ b/src/convolve/ui.c
@@ -32,10 +32,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <nproc.h> /* From Gnulib. */
#include <gnuastro/fits.h>
+#include <gnuastro/array.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/arraymanip.h>
#include <gnuastro/configfiles.h>
#include "main.h"
@@ -467,9 +467,9 @@ preparearrays(struct convolveparams *p)
becomes 1 (and their division would be meaningful!).*/
size=p->is0*p->is1;
sum=gal_statistics_float_sum(p->input, size);
- gal_arraymanip_fmultip_const(p->input, size, 1/sum);
+ gal_array_fmultip_const(p->input, size, 1/sum);
sum=gal_statistics_float_sum(p->kernel, size);
- gal_arraymanip_fmultip_const(p->kernel, size, 1/sum);
+ gal_array_fmultip_const(p->kernel, size, 1/sum);
}
/* Read the kernel. If there is anything particular to Convolve, then
@@ -503,7 +503,7 @@ preparearrays(struct convolveparams *p)
if(p->kernelnorm)
{
sum=gal_statistics_float_sum(kernel, size);
- gal_arraymanip_fmultip_const(kernel, size, 1/sum);
+ gal_array_fmultip_const(kernel, size, 1/sum);
}
/* Flip the kernel: */
diff --git a/src/imgstat/ui.c b/src/imgstat/ui.c
index f929c92..3140aa4 100644
--- a/src/imgstat/ui.c
+++ b/src/imgstat/ui.c
@@ -34,10 +34,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/qsort.h>
+#include <gnuastro/array.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/arraymanip.h>
#include <gnuastro/statistics.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
@@ -487,14 +487,14 @@ preparearrays(struct imgstatparams *p)
if(p->ignoremin)
{
gal_statistics_float_min(p->img, p->size, &min);
- gal_arraymanip_freplace_value(p->img, p->size, min, NAN);
+ gal_array_freplace_value(p->img, p->size, min, NAN);
}
/* Move all the non-nan elements to the start of the array: */
- gal_arraymanip_no_nans(p->img, &p->size);
+ gal_array_no_nans(p->img, &p->size);
/* Make a sorted array for most of the jobs: */
- gal_arraymanip_float_copy(p->img, p->size, &p->sorted);
+ gal_array_float_copy(p->img, p->size, &p->sorted);
qsort(p->sorted, p->size, sizeof *p->sorted, gal_qsort_float_increasing);
/* Check the given range: */
diff --git a/src/mkprof/mkprof.c b/src/mkprof/mkprof.c
index 285c924..2a1e3cd 100644
--- a/src/mkprof/mkprof.c
+++ b/src/mkprof/mkprof.c
@@ -31,12 +31,12 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/box.h>
#include <gnuastro/fits.h>
+#include <gnuastro/array.h>
#include <gnuastro/timing.h>
#include <gnuastro/threads.h>
#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/arraymanip.h>
#include "main.h"
diff --git a/src/mkprof/oneprofile.c b/src/mkprof/oneprofile.c
index 11f816d..9030ae5 100644
--- a/src/mkprof/oneprofile.c
+++ b/src/mkprof/oneprofile.c
@@ -34,9 +34,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gsl/gsl_integration.h> /* gsl_integration_qng */
#include <gnuastro/fits.h>
+#include <gnuastro/array.h>
#include <gnuastro/timing.h>
#include <gnuastro/neighbors.h>
-#include <gnuastro/arraymanip.h>
#include <gnuastro/statistics.h>
#include <gnuastro/linkedlist.h>
@@ -620,10 +620,10 @@ makeoneprofile(struct mkonthread *mkp)
/* Correct all the profile pixels. */
if(p->magatpeak)
- gal_arraymanip_fmultip_const(mkp->ibq->img, size,
- mkp->brightness/mkp->peakflux);
+ gal_array_fmultip_const(mkp->ibq->img, size,
+ mkp->brightness/mkp->peakflux);
else
- gal_arraymanip_fmultip_const(mkp->ibq->img, size,
- mkp->brightness/sum);
+ gal_array_fmultip_const(mkp->ibq->img, size,
+ mkp->brightness/sum);
}
}
diff --git a/src/mkprof/ui.c b/src/mkprof/ui.c
index ac444ca..60d4d87 100644
--- a/src/mkprof/ui.c
+++ b/src/mkprof/ui.c
@@ -34,10 +34,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/box.h>
#include <gnuastro/wcs.h>
#include <gnuastro/fits.h>
+#include <gnuastro/array.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/arraymanip.h>
#include <gnuastro/statistics.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
@@ -859,7 +859,7 @@ preparearrays(struct mkprofparams *p)
/* If the user just wanted the headers, then change all non-NaN
pixels to 0.0f. */
if(up->inputascanvas)
- gal_arraymanip_freplace_nonnans(p->out, naxes[0]*naxes[1], 0.0f);
+ gal_array_freplace_nonnans(p->out, naxes[0]*naxes[1], 0.0f);
}
diff --git a/src/noisechisel/clumps.c b/src/noisechisel/clumps.c
index 9579272..024c42a 100644
--- a/src/noisechisel/clumps.c
+++ b/src/noisechisel/clumps.c
@@ -30,11 +30,11 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/fits.h>
+#include <gnuastro/array.h>
#include <gnuastro/qsort.h>
#include <gnuastro/timing.h>
#include <gnuastro/checkset.h>
#include <gnuastro/neighbors.h>
-#include <gnuastro/arraymanip.h>
#include <gnuastro/linkedlist.h>
#include <gnuastro/statistics.h>
@@ -965,7 +965,7 @@ removefalseclumps(struct clumpsthreadparams *ctp, float
*sntable)
ctp->numclumps*sizeof *newlabs);
/* We want the removed regions to become SEGMENTINIT. */
- gal_arraymanip_long_init(newlabs, ctp->numclumps, SEGMENTINIT);
+ gal_array_long_init(newlabs, ctp->numclumps, SEGMENTINIT);
/* Set the new labels: */
if(ctp->p->keepmaxnearriver)
diff --git a/src/noisechisel/detection.c b/src/noisechisel/detection.c
index 2fedd47..23ed869 100644
--- a/src/noisechisel/detection.c
+++ b/src/noisechisel/detection.c
@@ -29,11 +29,11 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/mesh.h>
+#include <gnuastro/array.h>
#include <gnuastro/qsort.h>
#include <gnuastro/timing.h>
#include <gnuastro/threads.h>
#include <gnuastro/checkset.h>
-#include <gnuastro/arraymanip.h>
#include <gnuastro/statistics.h>
#include "main.h"
@@ -96,7 +96,7 @@ initialdetection(struct noisechiselparams *p)
else
for(i=0;i<p->erode;++i)
dilate0_erode1_8con(p->byt, s0, s1, 1);
- gal_arraymanip_uchar_replace(p->byt, s0*s1, BINARYNOOP, 1);
+ gal_array_uchar_replace(p->byt, s0*s1, BINARYNOOP, 1);
if(detectionname)
gal_fits_array_to_file(detectionname, "Eroded", BYTE_IMG, p->byt,
s0, s1, p->anyblank, p->wcs, NULL,
@@ -534,18 +534,18 @@ detsnthresh(struct noisechiselparams *p)
times (once for the sky region and once for the detected
region). So the first time we operate on it, */
if(p->b0f1==0)
- gal_arraymanip_uchar_copy(p->dbyt, s0*s1, &originaldbyt);
+ gal_array_uchar_copy(p->dbyt, s0*s1, &originaldbyt);
/* Find the psudo-detections: */
if(p->detectionname)
{
p->stepnum=1;
/* Backup of p->dbyt in tmp */
- gal_arraymanip_uchar_copy(p->dbyt, s0*s1, &tmp);
+ gal_array_uchar_copy(p->dbyt, s0*s1, &tmp);
while(p->stepnum<4)
{
free(p->dbyt); /* Free the old, p->dbyt, put the original */
- gal_arraymanip_uchar_copy(tmp, s0*s1, &p->dbyt);
+ gal_array_uchar_copy(tmp, s0*s1, &p->dbyt);
gal_mesh_operate_on_mesh(lmp, detectpseudos,
sizeof(unsigned char), 0, 0);
switch(p->stepnum)
diff --git a/src/noisechisel/noisechisel.c b/src/noisechisel/noisechisel.c
index 6a57abf..b0efc83 100644
--- a/src/noisechisel/noisechisel.c
+++ b/src/noisechisel/noisechisel.c
@@ -29,8 +29,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/fits.h>
+#include <gnuastro/array.h>
#include <gnuastro/timing.h>
-#include <gnuastro/arraymanip.h>
#include "main.h"
@@ -231,13 +231,13 @@ noisechisel(struct noisechiselparams *p)
gal_fits_array_to_file(p->maskdetname, "Input", FLOAT_IMG,
p->img, s0, s1, p->anyblank, p->wcs,
NULL, SPACK_STRING);
- gal_arraymanip_float_copy(p->img, s0*s1, &imgcopy);
+ gal_array_float_copy(p->img, s0*s1, &imgcopy);
maskbackorforeground(imgcopy, s0*s1, p->byt, 0);
gal_fits_array_to_file(p->maskdetname, "Undetected masked",
FLOAT_IMG, imgcopy, s0, s1, p->anyblank,
p->wcs, NULL, SPACK_STRING);
free(imgcopy);
- gal_arraymanip_float_copy(p->img, s0*s1, &imgcopy);
+ gal_array_float_copy(p->img, s0*s1, &imgcopy);
maskbackorforeground(imgcopy, s0*s1, p->byt, 1);
gal_fits_array_to_file(p->maskdetname, "Detected masked",
FLOAT_IMG, imgcopy, s0, s1, p->anyblank,
diff --git a/src/noisechisel/ui.c b/src/noisechisel/ui.c
index 47793a7..96efd9b 100644
--- a/src/noisechisel/ui.c
+++ b/src/noisechisel/ui.c
@@ -33,11 +33,11 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <nproc.h> /* From Gnulib. */
#include <gnuastro/fits.h>
+#include <gnuastro/array.h>
#include <gnuastro/timing.h> /* includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/commonargs.h>
-#include <gnuastro/arraymanip.h>
#include <gnuastro/statistics.h>
#include <gnuastro/configfiles.h>
diff --git a/src/subtractsky/subtractsky.c b/src/subtractsky/subtractsky.c
index 5ada80c..77e44b1 100644
--- a/src/subtractsky/subtractsky.c
+++ b/src/subtractsky/subtractsky.c
@@ -31,9 +31,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/mesh.h>
#include <gnuastro/mode.h>
#include <gnuastro/qsort.h>
+#include <gnuastro/array.h>
#include <gnuastro/timing.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/arraymanip.h>
#include "main.h"
@@ -229,8 +229,8 @@ subtractsky(struct subtractskyparams *p)
/* Subtract the sky value */
- gal_arraymanip_fmultip_const(sky, s0*s1, -1.0f);
- skysubtracted=gal_arraymanip_fsum_arrays(mp->img, sky, s0*s1);
+ gal_array_fmultip_const(sky, s0*s1, -1.0f);
+ skysubtracted=gal_array_fsum_arrays(mp->img, sky, s0*s1);
gal_fits_array_to_file(p->cp.output ,"SkySubtracted", FLOAT_IMG,
skysubtracted, s0, s1, p->anyblank, p->wcs,
NULL, SPACK_STRING);
diff --git a/src/subtractsky/ui.c b/src/subtractsky/ui.c
index eb68215..6b4aa33 100644
--- a/src/subtractsky/ui.c
+++ b/src/subtractsky/ui.c
@@ -33,11 +33,11 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <nproc.h> /* From Gnulib. */
#include <gnuastro/fits.h>
+#include <gnuastro/array.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/arraymanip.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnuastro-commits] master c009984: Renamed arraymanip library to array,
Mohammad Akhlaghi <=