Remove _raw from the raw param type

JamesYang007 · Apr 21, 2020 · 3beb099 · 3beb099
1 parent bad3f55
commit 3beb099
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/include/autoppl/expr_builder.hpp b/include/autoppl/expr_builder.hpp
@@ -26,7 +26,7 @@ namespace details {
  * Converter from arbitrary (decayed) type to valid continuous parameter type 
  * by the following mapping:
  * - is_var_v<T> true => VariableViewer<T>
- * - T is same as cont_raw_param_t => Constant<T>
+ * - T is same as cont_param_t => Constant<T>
  * - is_var_expr_v<T> true => T
  * Assumes each condition is non-overlapping.
  */
@@ -37,7 +37,7 @@ struct convert_to_cont_dist_param
 template <class T>
 struct convert_to_cont_dist_param<T,
     std::enable_if_t<util::is_var_v<std::decay_t<T>> && 
-                    !std::is_same_v<std::decay_t<T>, util::cont_raw_param_t> &&
+                    !std::is_same_v<std::decay_t<T>, util::cont_param_t> &&
                     !util::is_var_expr_v<std::decay_t<T>>
                     >>
 {
@@ -47,7 +47,7 @@ struct convert_to_cont_dist_param<T,
 template <class T>
 struct convert_to_cont_dist_param<T, 
     std::enable_if_t<!util::is_var_v<std::decay_t<T>> && 
-                    std::is_same_v<std::decay_t<T>, util::cont_raw_param_t> &&
+                    std::is_same_v<std::decay_t<T>, util::cont_param_t> &&
                     !util::is_var_expr_v<std::decay_t<T>>
                     >>
 {
@@ -57,7 +57,7 @@ struct convert_to_cont_dist_param<T,
 template <class T>
 struct convert_to_cont_dist_param<T, 
     std::enable_if_t<!util::is_var_v<std::decay_t<T>> && 
-                    !std::is_same_v<std::decay_t<T>, util::cont_raw_param_t> &&
+                    !std::is_same_v<std::decay_t<T>, util::cont_param_t> &&
                     util::is_var_expr_v<std::decay_t<T>>
                     >>
 {

diff --git a/include/autoppl/expression/distribution/bernoulli.hpp b/include/autoppl/expression/distribution/bernoulli.hpp
@@ -13,7 +13,7 @@ struct Bernoulli
 {
     static_assert(util::is_var_expr_v<p_type>);
 
-    using value_t = util::disc_raw_param_t;
+    using value_t = util::disc_param_t;
     using param_value_t = typename util::var_expr_traits<p_type>::value_t;
     using dist_value_t = typename BernoulliBase::dist_value_t;
 

diff --git a/include/autoppl/expression/distribution/normal.hpp b/include/autoppl/expression/distribution/normal.hpp
@@ -14,7 +14,7 @@ struct Normal
     static_assert(util::is_var_expr_v<mean_type>);
     static_assert(util::is_var_expr_v<stddev_type>);
 
-    using value_t = util::cont_raw_param_t;
+    using value_t = util::cont_param_t;
     using param_value_t = std::common_type_t<
         typename util::var_expr_traits<mean_type>::value_t,
         typename util::var_expr_traits<stddev_type>::value_t

diff --git a/include/autoppl/expression/distribution/uniform.hpp b/include/autoppl/expression/distribution/uniform.hpp
@@ -14,7 +14,7 @@ struct Uniform
     static_assert(util::is_var_expr_v<min_type>);
     static_assert(util::is_var_expr_v<max_type>);
 
-    using value_t = util::cont_raw_param_t;
+    using value_t = util::cont_param_t;
     using param_value_t = std::common_type_t<
         typename util::var_expr_traits<min_type>::value_t,
         typename util::var_expr_traits<max_type>::value_t

diff --git a/include/autoppl/util/dist_expr_traits.hpp b/include/autoppl/util/dist_expr_traits.hpp
@@ -16,12 +16,12 @@ namespace util {
 /*
  * Continuous distribution expressions can be constructed with this type.
  */
-using cont_raw_param_t = double;
+using cont_param_t = double;
 
 /*
  * Discrete distribution expressions can be constructed with this type.
  */
-using disc_raw_param_t = int64_t;
+using disc_param_t = int64_t;
 
 /*
  * Traits for Distribution Expression classes.

diff --git a/include/autoppl/variable.hpp b/include/autoppl/variable.hpp
@@ -78,7 +78,7 @@ struct Variable
 };
 
 // Useful aliases
-using cont_var = Variable<util::cont_raw_param_t>; // continuous RV var
-using disc_var = Variable<util::disc_raw_param_t>; // discrete RV var
+using cont_var = Variable<util::cont_param_t>; // continuous RV var
+using disc_var = Variable<util::disc_param_t>; // discrete RV var
 
 } // namespace ppl
diff --git a/test/expr_builder_unittest.cpp b/test/expr_builder_unittest.cpp
@@ -14,7 +14,7 @@ TEST_F(expr_builder_fixture, convert_to_cont_dist_param_var)
     using namespace details;
     static_assert(std::is_same_v<MockVar, std::decay_t<MockVar>>);
     static_assert(util::is_var_v<MockVar>);
-    static_assert(!std::is_same_v<MockVar, util::cont_raw_param_t>);
+    static_assert(!std::is_same_v<MockVar, util::cont_param_t>);
     static_assert(!util::is_var_expr_v<MockVar>);
     static_assert(std::is_same_v<
             convert_to_cont_dist_param_t<MockVar>,
@@ -25,10 +25,10 @@ TEST_F(expr_builder_fixture, convert_to_cont_dist_param_var)
 TEST_F(expr_builder_fixture, convert_to_cont_dist_param_raw)
 {
     using namespace details;
-    using data_t = util::cont_raw_param_t;
+    using data_t = util::cont_param_t;
     static_assert(std::is_same_v<data_t, std::decay_t<data_t>>);
     static_assert(!util::is_var_v<data_t>);
-    static_assert(std::is_same_v<data_t, util::cont_raw_param_t>);
+    static_assert(std::is_same_v<data_t, util::cont_param_t>);
     static_assert(!util::is_var_expr_v<data_t>);
     static_assert(std::is_same_v<
             convert_to_cont_dist_param_t<data_t>,
@@ -40,7 +40,7 @@ TEST_F(expr_builder_fixture, convert_to_cont_dist_param_var_expr)
 {
     using namespace details;
     static_assert(!util::is_var_v<MockVarExpr>);
-    static_assert(!std::is_same_v<MockVarExpr, util::cont_raw_param_t>);
+    static_assert(!std::is_same_v<MockVarExpr, util::cont_param_t>);
     static_assert(util::is_var_expr_v<MockVarExpr>);
     static_assert(std::is_same_v<
             convert_to_cont_dist_param_t<MockVarExpr&>,