[lmi-commits] [lmi] master 1f212b8 4/6: Rename math_functors* to math_functions*

[Greg Chicares]

branch: master
commit 1f212b8b270b5b50ebb77e31e94f1b16bbba71d1
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Rename math_functors* to math_functions*
---
 Makefile.am                                       | 10 +++++-----
 bcc_5_5_1.make                                    |  2 +-
 commutation_functions_test.cpp                    |  2 +-
 dbvalue.cpp                                       |  2 +-
 gpt_server.cpp                                    |  2 +-
 gpt_test.cpp                                      |  2 +-
 ihs_avmly.cpp                                     |  2 +-
 ihs_basicval.cpp                                  |  2 +-
 ihs_mortal.cpp                                    |  2 +-
 interest_rates.cpp                                |  2 +-
 loads.cpp                                         |  2 +-
 math_functors.hpp => math_functions.hpp           |  6 +++---
 math_functors_test.cpp => math_functions_test.cpp |  2 +-
 mec_server.cpp                                    |  2 +-
 mortality_rates.cpp                               |  2 +-
 mortality_rates_test.cpp                          |  2 +-
 objects.make                                      |  6 +++---
 17 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 770efc5..59d70c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,7 +116,7 @@ TESTS = \
     test_loads \
     test_map_lookup \
     test_materially_equal \
-    test_math_functors \
+    test_math_functions \
     test_mc_enum \
     test_miscellany \
     test_mortality_rates \
@@ -833,11 +833,11 @@ test_materially_equal_SOURCES = \
   materially_equal_test.cpp
 test_materially_equal_CXXFLAGS = $(AM_CXXFLAGS)
 
-test_math_functors_SOURCES = \
+test_math_functions_SOURCES = \
   $(common_test_objects) \
-  math_functors_test.cpp \
+  math_functions_test.cpp \
   timer.cpp
-test_math_functors_CXXFLAGS = $(AM_CXXFLAGS)
+test_math_functions_CXXFLAGS = $(AM_CXXFLAGS)
 
 test_mc_enum_SOURCES = \
   $(common_test_objects) \
@@ -1221,7 +1221,7 @@ noinst_HEADERS = \
     main_common.hpp \
     map_lookup.hpp \
     materially_equal.hpp \
-    math_functors.hpp \
+    math_functions.hpp \
     mc_enum.hpp \
     mc_enum.tpp \
     mc_enum_aux.hpp \
diff --git a/bcc_5_5_1.make b/bcc_5_5_1.make
index ed10e3c..1bf1865 100644
--- a/bcc_5_5_1.make
+++ b/bcc_5_5_1.make
@@ -138,7 +138,7 @@ excluded_unit_test_targets := \
   irc7702a_test \
   istream_to_string_test \
   loads_test \
-  math_functors_test \
+  math_functions_test \
   mc_enum_test \
   mortality_rates_test \
   path_utility_test \
diff --git a/commutation_functions_test.cpp b/commutation_functions_test.cpp
index a51cf11..9f639e5 100644
--- a/commutation_functions_test.cpp
+++ b/commutation_functions_test.cpp
@@ -24,7 +24,7 @@
 #include "commutation_functions.hpp"
 
 #include "et_vector.hpp"
-#include "math_functors.hpp"
+#include "math_functions.hpp"
 #include "miscellany.hpp"               // lmi_array_size()
 #include "test_tools.hpp"
 #include "timer.hpp"
diff --git a/dbvalue.cpp b/dbvalue.cpp
index a8b1830..8508950 100644
--- a/dbvalue.cpp
+++ b/dbvalue.cpp
@@ -29,7 +29,7 @@
 #include "dbnames.hpp"
 #include "et_vector.hpp"
 #include "handle_exceptions.hpp"
-#include "math_functors.hpp"            // lesser_of()
+#include "math_functions.hpp"           // lesser_of()
 #include "print_matrix.hpp"
 #include "value_cast.hpp"
 #include "xml_serialize.hpp"
diff --git a/gpt_server.cpp b/gpt_server.cpp
index 9e9d5ce..a445b7d 100644
--- a/gpt_server.cpp
+++ b/gpt_server.cpp
@@ -38,7 +38,7 @@
 #include "ihs_irc7702a.hpp"
 #include "ihs_server7702.hpp"           // RunServer7702FromStruct()
 #include "materially_equal.hpp"         // material_difference()
-#include "math_functors.hpp"
+#include "math_functions.hpp"
 #include "mc_enum_types_aux.hpp"        // mc_state_from_string()
 #include "miscellany.hpp"               // each_equal(), ios_out_trunc_binary()
 #include "oecumenic_enumerations.hpp"
diff --git a/gpt_test.cpp b/gpt_test.cpp
index ec1ee07..9c5c0b8 100644
--- a/gpt_test.cpp
+++ b/gpt_test.cpp
@@ -26,7 +26,7 @@
 
 #include "assert_lmi.hpp"
 #include "materially_equal.hpp"
-#include "math_functors.hpp"
+#include "math_functions.hpp"
 #include "test_tools.hpp"
 #include "timer.hpp"
 
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 5e2053c..e717108 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -36,7 +36,7 @@
 #include "ledger_variant.hpp"
 #include "loads.hpp"
 #include "materially_equal.hpp"
-#include "math_functors.hpp"
+#include "math_functions.hpp"
 #include "miscellany.hpp"
 #include "mortality_rates.hpp"
 #include "outlay.hpp"
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 58a49ff..f3494b0 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -41,7 +41,7 @@
 #include "input.hpp"
 #include "interest_rates.hpp"
 #include "loads.hpp"
-#include "math_functors.hpp"
+#include "math_functions.hpp"
 #include "mc_enum_types_aux.hpp"        // mc_str()
 #include "mortality_rates.hpp"
 #include "outlay.hpp"
diff --git a/ihs_mortal.cpp b/ihs_mortal.cpp
index d8ccd39..10d5a4f 100644
--- a/ihs_mortal.cpp
+++ b/ihs_mortal.cpp
@@ -27,7 +27,7 @@
 #include "assert_lmi.hpp"
 #include "basic_values.hpp"
 #include "et_vector.hpp"
-#include "math_functors.hpp"            // assign_midpoint()
+#include "math_functions.hpp"           // assign_midpoint()
 
 #include <algorithm>                    // min()
 
diff --git a/interest_rates.cpp b/interest_rates.cpp
index 55c0976..1b8a289 100644
--- a/interest_rates.cpp
+++ b/interest_rates.cpp
@@ -28,7 +28,7 @@
 #include "basic_values.hpp"
 #include "database.hpp"
 #include "dbnames.hpp"
-#include "math_functors.hpp"            // assign_midpoint()
+#include "math_functions.hpp"           // assign_midpoint()
 #include "miscellany.hpp"               // each_equal()
 #include "yare_input.hpp"
 
diff --git a/loads.cpp b/loads.cpp
index bff8e5d..b9392f2 100644
--- a/loads.cpp
+++ b/loads.cpp
@@ -30,7 +30,7 @@
 #include "database.hpp"
 #include "dbnames.hpp"
 #include "et_vector.hpp"
-#include "math_functors.hpp"            // assign_midpoint()
+#include "math_functions.hpp"           // assign_midpoint()
 #include "mc_enum_types_aux.hpp"        // mc_n_ enumerators
 #include "premium_tax.hpp"
 
diff --git a/math_functors.hpp b/math_functions.hpp
similarity index 99%
rename from math_functors.hpp
rename to math_functions.hpp
index 721742e..41f70a0 100644
--- a/math_functors.hpp
+++ b/math_functions.hpp
@@ -19,8 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifndef math_functors_hpp
-#define math_functors_hpp
+#ifndef math_functions_hpp
+#define math_functions_hpp
 
 #include "config.hpp"
 
@@ -346,5 +346,5 @@ void assign_midpoint
     assign(out, apply_binary(mean<T>(), in_0, in_1));
 }
 
-#endif // math_functors_hpp
+#endif // math_functions_hpp
 
diff --git a/math_functors_test.cpp b/math_functions_test.cpp
similarity index 99%
rename from math_functors_test.cpp
rename to math_functions_test.cpp
index 462aa51..3d76824 100644
--- a/math_functors_test.cpp
+++ b/math_functions_test.cpp
@@ -21,7 +21,7 @@
 
 #include "pchfile.hpp"
 
-#include "math_functors.hpp"
+#include "math_functions.hpp"
 
 #include "fenv_lmi.hpp"
 #include "materially_equal.hpp"
diff --git a/mec_server.cpp b/mec_server.cpp
index c1871e2..64c902b 100644
--- a/mec_server.cpp
+++ b/mec_server.cpp
@@ -35,7 +35,7 @@
 #include "et_vector.hpp"
 #include "ihs_irc7702a.hpp"
 #include "materially_equal.hpp"         // material_difference()
-#include "math_functors.hpp"
+#include "math_functions.hpp"
 #include "mc_enum_types_aux.hpp"        // mc_state_from_string()
 #include "mec_input.hpp"
 #include "mec_xml_document.hpp"
diff --git a/mortality_rates.cpp b/mortality_rates.cpp
index 921cfe8..9f2128d 100644
--- a/mortality_rates.cpp
+++ b/mortality_rates.cpp
@@ -28,7 +28,7 @@
 #include "basic_values.hpp"
 #include "database.hpp"
 #include "dbnames.hpp"
-#include "math_functors.hpp"            // assign_midpoint()
+#include "math_functions.hpp"           // assign_midpoint()
 
 #include <algorithm>                    // min()
 
diff --git a/mortality_rates_test.cpp b/mortality_rates_test.cpp
index 733a9bb..861501c 100644
--- a/mortality_rates_test.cpp
+++ b/mortality_rates_test.cpp
@@ -25,7 +25,7 @@
 
 #include "assert_lmi.hpp"
 #include "materially_equal.hpp"
-#include "math_functors.hpp"
+#include "math_functions.hpp"
 #include "test_tools.hpp"
 
 namespace
diff --git a/objects.make b/objects.make
index 6fff9c3..853e71a 100644
--- a/objects.make
+++ b/objects.make
@@ -439,7 +439,7 @@ unit_test_targets := \
   loads_test \
   map_lookup_test \
   materially_equal_test \
-  math_functors_test \
+  math_functions_test \
   mc_enum_test \
   miscellany_test \
   mortality_rates_test \
@@ -740,9 +740,9 @@ materially_equal_test$(EXEEXT): \
   $(common_test_objects) \
   materially_equal_test.o \
 
-math_functors_test$(EXEEXT): \
+math_functions_test$(EXEEXT): \
   $(common_test_objects) \
-  math_functors_test.o \
+  math_functions_test.o \
   timer.o \
 
 mc_enum_test$(EXEEXT): \