[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master d0b19b8 10/19: Match: make check script for k-
From: |
Mohammad Akhlaghi |
Subject: |
[gnuastro-commits] master d0b19b8 10/19: Match: make check script for k-d tree matching now executable |
Date: |
Sun, 14 Nov 2021 20:40:59 -0500 (EST) |
branch: master
commit d0b19b8d6382a3496e6ac3aaa0e6eb7bc2482bd0
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Match: make check script for k-d tree matching now executable
Until now, the script's executable flag wasn't activated so 'make check'
would fail.
With this commit, it is now executable, also the copyright year of the file
has been set to 2021 (since it was just created).
---
bin/match/ui.c | 7 +++----
tests/Makefile.am | 4 ++--
tests/match/{kdtree-match.sh => kdtree.sh} | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/bin/match/ui.c b/bin/match/ui.c
index b8fb280..bc4eb70 100644
--- a/bin/match/ui.c
+++ b/bin/match/ui.c
@@ -256,8 +256,8 @@ ui_read_check_only_options(struct matchparams *p)
static void
ui_check_options_and_arguments(struct matchparams *p)
{
- /* When '--coord' is given, there should be no second catalog
- (argument). */
+ /* When '--coord' is given, or we are in k-d tree building mode, there
+ should be no second catalog (argument). */
if(p->coord || p->kdtreemode==MATCH_KDTREE_BUILD)
{
/* Make sure no second argument is given. */
@@ -278,7 +278,7 @@ ui_check_options_and_arguments(struct matchparams *p)
}
}
- /* '--coord' is not given. */
+ /* We need two input catalogs. */
else
{
/* Without 'coord' atleast one input is necessary. */
@@ -298,7 +298,6 @@ ui_check_options_and_arguments(struct matchparams *p)
}
}
-
/* If the first input is a FITS file, make sure its HDU is also given. */
if( p->input1name
&& gal_fits_file_recognized(p->input1name)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0240bb4..7cf7cbf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -127,11 +127,11 @@ if COND_FITS
endif
if COND_MATCH
MAYBE_MATCH_TESTS = match/positions.sh match/merged-cols.sh \
- match/kdtree-match.sh
+ match/kdtree.sh
+ match/kdtree.sh: prepconf.sh.log
match/positions.sh: prepconf.sh.log
match/merged-cols.sh: prepconf.sh.log
- match/kdtree-match.sh: prepconf.sh.log
endif
if COND_MKCATALOG
MAYBE_MKCATALOG_TESTS = mkcatalog/detections.sh mkcatalog/simple-3d.sh \
diff --git a/tests/match/kdtree-match.sh b/tests/match/kdtree.sh
old mode 100644
new mode 100755
similarity index 96%
rename from tests/match/kdtree-match.sh
rename to tests/match/kdtree.sh
index 2e8ac0e..4a76150
--- a/tests/match/kdtree-match.sh
+++ b/tests/match/kdtree.sh
@@ -6,7 +6,7 @@
# Original author:
# Sachin Kumar Singh <sachinkumarsingh092@gmail.com>
# Contributing author(s):
-# Copyright (C) 2015-2021, Free Software Foundation, Inc.
+# Copyright (C) 2021, Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
- [gnuastro-commits] master updated (33b7b70 -> f5d7d1a), Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 0dcaf02 02/19: Match: Added build functionalty for kdtree, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master c36f753 01/19: Match: Option to work with k-d trees has been defined, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master e04f4ac 03/19: First implementation of k-d tree matching, not complete, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 20ad77d 07/19: Final output for kdtree matching, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 7354e33 09/19: Library (match.h): match_coordinate_ replaced by match_sort_based_, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 03d1a25 15/19: Library (fits.h): corrected segmentation fault in parallel reading, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 336ddee 04/19: Error in `match_kdtree_worker` in lib/match.c, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 2877acb 05/19: Added fits files for testing in `during-dev-test-data`, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 48d760d 12/19: Library (match.h): k-d tree method discards regions with no overlap, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master d0b19b8 10/19: Match: make check script for k-d tree matching now executable,
Mohammad Akhlaghi <=
- [gnuastro-commits] master 095c788 13/19: Match: matched rows aren't permuted, but new column allocated, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 9e258a8 14/19: Library (fits.h): reading table columns now done in parallel, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 29f8b20 16/19: Table and Arithmetic: corrected some memory leaks, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 8b17675 06/19: Corrected segmentation fault, included aperture, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master a7bfa5b 11/19: Match: k-d tree matching UI fixed, to do: finalizing docs and tests, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master f5d7d1a 19/19: Match: added tests, completed docs of new k-d tree based matching, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 6f7ff61 08/19: Library (match.h): Using the old infra-structure for double-matches, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master 68823e3 17/19: Library (fits.h): correctly reading columns of 0 width/repeat, Mohammad Akhlaghi, 2021/11/14
- [gnuastro-commits] master a6b838c 18/19: Match: script to generate debugging input taken in bin/match/, Mohammad Akhlaghi, 2021/11/14