add linear_map::origin()

rename linear_map::offset_ --> origin_


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@485 f88db872-0e4f-0410-b76b-b9085cfa78c5

3 files changed, 9 insertions, 7 deletions

diff --git a/src/jtutil/linear_map.cc b/src/jtutil/linear_map.cc
index 5106949..75bacb1 100644
--- a/src/jtutil/linear_map.cc
+++ b/src/jtutil/linear_map.cc
@@ -82,8 +82,8 @@ void linear_map<fp>::constructor_common(fp min_fp_in, fp max_fp_in)
 	// ==> ok to use min_int(), max_int(), delta_fp(), inverse_delta_fp()
 	// ... other class members *not* yet initialized
 {
-offset_ = 0.0;		// temp value
-offset_ = min_fp_in - fp_of_int_unchecked(min_int());
+origin_ = 0.0;		// temp value
+origin_ = min_fp_in - fp_of_int_unchecked(min_int());
 
 // this should be guaranteed by the above calculation
 assert(fuzzy<fp>::EQ(fp_of_int_unchecked(min_int()), min_fp_in));
@@ -124,7 +124,7 @@ if (! is_in_range(x))
 		   double(min_fp()), double(delta_fp()), double(max_fp()));
 								/*NOTREACHED*/
 
-return inverse_delta_ * (x - offset_);
+return inverse_delta_ * (x - origin_);
 }
 	  }	// namespace jtutil::
 
diff --git a/src/jtutil/linear_map.hh b/src/jtutil/linear_map.hh
index 9bd21c1..3d6cd42 100644
--- a/src/jtutil/linear_map.hh
+++ b/src/jtutil/linear_map.hh
@@ -48,7 +48,7 @@ public:
 
 	// convert int --> fp
 	fp fp_of_int_unchecked(int i) const
-		{ return offset_ + delta_*i; }
+		{ return origin_ + delta_*i; }
 	fp fp_of_int(int i) const
 		{
 		assert(is_in_range(i));
@@ -60,9 +60,10 @@ public:
 		{ return delta_ * delta_i; }
 
 	// fp bounds info
-	fp min_fp() const { return fp_of_int_unchecked(min_int_); }
+	fp origin() const { return origin_; }
 	fp delta_fp() const { return delta_; }
 	fp inverse_delta_fp() const { return inverse_delta_; }
+	fp min_fp() const { return fp_of_int_unchecked(min_int_); }
 	fp max_fp() const { return fp_of_int_unchecked(max_int_); }
 	bool is_in_range(fp x) const
 		{
@@ -122,7 +123,7 @@ private:
 
 	// these define the actual mapping
 	// via the  fp_of_int()  function (above)
-	fp offset_, delta_;
+	fp origin_, delta_;
 
 	// cache of 1.0/delta_
 	// ==> avoids fp divide in inverse_delta_fp()
diff --git a/src/jtutil/test_linear_map.cc b/src/jtutil/test_linear_map.cc
index 6456b93..9963daf 100644
--- a/src/jtutil/test_linear_map.cc
+++ b/src/jtutil/test_linear_map.cc
@@ -54,9 +54,10 @@ assert( lm.clamp(max_int    ) == max_int    );
 assert( lm.clamp(max_int+1  ) == max_int    );
 assert( lm.clamp(max_int+100) == max_int    );
 
-assert( fuzzy<double>::EQ(lm.min_fp(), min_fp) );
+assert( fuzzy<double>::EQ(lm.origin(), lm.fp_of_int_unchecked(0)) );
 assert( fuzzy<double>::EQ(lm.delta_fp(), delta_fp) );
 assert( fuzzy<double>::EQ(lm.inverse_delta_fp(), 1.0/delta_fp) );
+assert( fuzzy<double>::EQ(lm.min_fp(), min_fp) );
 assert( fuzzy<double>::EQ(lm.max_fp(), max_fp) );
 
 assert(   lm.is_in_range(min_fp)         );