diff options
Diffstat (limited to 'src/jtutil/cpm_map.cc')
| -rw-r--r-- | src/jtutil/cpm_map.cc | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/jtutil/cpm_map.cc b/src/jtutil/cpm_map.cc index 1a44b20..09ab35a 100644 --- a/src/jtutil/cpm_map.cc +++ b/src/jtutil/cpm_map.cc @@ -14,12 +14,7 @@ #include "stdc.h" #include "util.hh" #include "cpm_map.hh" - -// everything in this file is inside these namespaces -namespace AHFinderDirect - { -namespace jtutil - { +using jtutil::error_exit; //****************************************************************************** //****************************************************************************** @@ -30,6 +25,8 @@ namespace jtutil // specified fixed point (must be integer or half-integer) and domain. // The sample point need not be in the map's domain/range. // +namespace jtutil + { template <typename fp_t> cpm_map<fp_t>::cpm_map(int min_i_in, int max_i_in, fp_t fixed_point) @@ -53,6 +50,7 @@ assert( fuzzy<fp_t>::ceiling(fixed_point) ); } + } // namespace jtutil:: //****************************************************************************** @@ -61,6 +59,8 @@ assert( // specified by a sample point sample_i --> sample_j and by sign. // The sample point need not be in the map's domain/range. // +namespace jtutil + { template <typename fp_t> cpm_map<fp_t>::cpm_map(int min_i_in, int max_i_in, int sample_i, int sample_j, @@ -73,6 +73,7 @@ cpm_map<fp_t>::cpm_map(int min_i_in, int max_i_in, // verify that we have setup correct assert( map_unchecked(sample_i) == sample_j ); } + } // namespace jtutil:: //****************************************************************************** @@ -84,6 +85,8 @@ assert( map_unchecked(sample_i) == sample_j ); // is never ok) and by sign. The sample point need not be in the map's // domain/range. // +namespace jtutil + { template <typename fp_t> cpm_map<fp_t>::cpm_map(int min_i_in, int max_i_in, fp_t sample_i, fp_t sample_j, @@ -112,6 +115,7 @@ assert( (map_is_plus_in ? fuzzy<fp_t>::floor (sample_j) : fuzzy<fp_t>::ceiling(sample_j)) ); } + } // namespace jtutil:: //****************************************************************************** //****************************************************************************** @@ -121,12 +125,5 @@ assert( // ***** template instantiations ***** // -template class cpm_map<float>; -template class cpm_map<double>; - -//****************************************************************************** -//****************************************************************************** -//****************************************************************************** - - } // namespace jtutil - } // namespace AHFinderDirect +template class jtutil::cpm_map<float>; +template class jtutil::cpm_map<double>; |