Add namespace to each subdirectory

JamesYang007 · Apr 19, 2020 · 7341f48 · 7341f48
1 parent f09ada0
commit 7341f48
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 11 deletions.
diff --git a/include/autoppl/algorithm/mh.hpp b/include/autoppl/algorithm/mh.hpp
@@ -0,0 +1,7 @@
+#pragma once
+
+namespace ppl {
+
+
+
+} // namespace ppl
diff --git a/include/autoppl/distribution/bernoulli.hpp b/include/autoppl/distribution/bernoulli.hpp
@@ -6,6 +6,7 @@
 #include <autoppl/distribution/dist_expr.hpp>
 
 namespace ppl {
+namespace dist {
 
 template <typename p_type>
 struct Bernoulli : public DistExpr<Bernoulli<p_type>>
@@ -43,4 +44,5 @@ struct Bernoulli : public DistExpr<Bernoulli<p_type>>
     p_type p_;
 };
 
+} // namespace dist
 } // namespace ppl
diff --git a/include/autoppl/distribution/dist_expr.hpp b/include/autoppl/distribution/dist_expr.hpp
@@ -2,6 +2,7 @@
 #include <type_traits>
 
 namespace ppl {
+namespace dist {
 
 template <class Derived>
 struct DistExpr
@@ -15,7 +16,7 @@ struct DistExpr
 
 template <class T>
 inline constexpr bool is_dist_expr_v = 
-    std::is_convertible_v<T, DistExpr<T>>;
+    std::is_convertible_v<T, dist::DistExpr<T>>;
 
 #ifdef AUTOPPL_USE_CONCEPTS
 // TODO: definition should be extended with a stronger
@@ -24,4 +25,5 @@ template <class T>
 concept dist_expressable = is_dist_expr_v<T>; 
 #endif
 
+} // namespace dist
 } // namespace ppl
diff --git a/include/autoppl/distribution/normal.hpp b/include/autoppl/distribution/normal.hpp
@@ -6,6 +6,7 @@
 #include <autoppl/distribution/dist_expr.hpp>
 
 namespace ppl {
+namespace dist {
 
 template <typename mean_type, typename var_type>
 struct Normal : public DistExpr<Normal<mean_type, var_type>>
@@ -43,4 +44,5 @@ struct Normal : public DistExpr<Normal<mean_type, var_type>>
     var_type var_;
 };
 
-}  // namespace ppl
+} // namespace dist
+} // namespace ppl
diff --git a/include/autoppl/distribution/uniform.hpp b/include/autoppl/distribution/uniform.hpp
@@ -6,6 +6,7 @@
 #include <autoppl/distribution/dist_expr.hpp>
 
 namespace ppl {
+namespace dist {
 
 template <typename min_type, typename max_type>
 struct Uniform : public DistExpr<Uniform<min_type, max_type>>
@@ -44,4 +45,5 @@ struct Uniform : public DistExpr<Uniform<min_type, max_type>>
     max_type max_;
 };
 
+} // namespace dist
 } // namespace ppl
diff --git a/include/autoppl/expr_builder.hpp b/include/autoppl/expr_builder.hpp
@@ -1,8 +1,12 @@
 #pragma once
-#include <autoppl/expression/variable.hpp>
 #include <autoppl/expression/model_expr.hpp>
 #include <autoppl/expression/var_expr.hpp>
+#include <autoppl/expression/model.hpp>
+#include <autoppl/expression/variable.hpp>
+#include <autoppl/distribution/dist_expr.hpp>
 #include <autoppl/distribution/uniform.hpp>
+#include <autoppl/distribution/normal.hpp>
+#include <autoppl/distribution/bernoulli.hpp>
 
 namespace ppl {
 
@@ -20,7 +24,7 @@ namespace details {
 using cont_raw_param_t = double;
 template <class T>
 inline constexpr bool is_cont_param_valid =
-    is_var_expr_v<T> || 
+    expr::is_var_expr_v<T> || 
     std::is_convertible_v<T, cont_raw_param_t>;
 
 } // namespace details
@@ -88,7 +92,7 @@ template <class T, class DistType>
 inline constexpr auto operator|=(const Variable<T>& var,
                                  const DistType& dist)
 {
-    static_assert(is_dist_expr_v<DistType>);
+    static_assert(dist::is_dist_expr_v<DistType>);
     return EqNode(var, dist);
 }
 #else
@@ -104,8 +108,8 @@ template <class LHSNodeType, class RHSNodeType>
 inline constexpr auto operator,(const LHSNodeType& lhs,
                                 const RHSNodeType& rhs)
 {
-    static_assert(is_model_expr_v<LHSNodeType>);
-    static_assert(is_model_expr_v<RHSNodeType>);
+    static_assert(expr::is_model_expr_v<LHSNodeType>);
+    static_assert(expr::is_model_expr_v<RHSNodeType>);
     return GlueNode(lhs, rhs);
 }
 #else

diff --git a/include/autoppl/expression/model.hpp b/include/autoppl/expression/model.hpp
@@ -6,6 +6,7 @@
 #include <autoppl/expression/model_expr.hpp>
 
 namespace ppl {
+namespace expr {
 namespace details {
 
 template <class Iter>
@@ -95,4 +96,5 @@ struct GlueNode : public ModelExpr<GlueNode<LHSNodeType, RHSNodeType>>
     right_node_t right_node_;
 };
 
+} // namespace expr
 } // namespace ppl
diff --git a/include/autoppl/expression/model_expr.hpp b/include/autoppl/expression/model_expr.hpp
@@ -2,6 +2,7 @@
 #include <type_traits>
 
 namespace ppl {
+namespace expr {
 
 template <class Derived>
 struct ModelExpr
@@ -24,4 +25,5 @@ template <class T>
 concept model_expressable = is_model_expr_v<T>; 
 #endif
 
+} // namespace expr
 } // namespace ppl
diff --git a/include/autoppl/expression/var_expr.hpp b/include/autoppl/expression/var_expr.hpp
@@ -2,6 +2,7 @@
 #include <type_traits>
 
 namespace ppl {
+namespace expr {
 
 template <class Derived>
 struct VarExpr
@@ -24,4 +25,5 @@ template <class T>
 concept var_expressable = is_var_expr_v<T>; 
 #endif
 
+} // namespace expr
 } // namespace ppl
diff --git a/include/autoppl/expression/variable.hpp b/include/autoppl/expression/variable.hpp
@@ -19,7 +19,7 @@ enum class var_state : bool {
  * a model expression and the users, who must supply storage of values associated with this var.
  */
 template <class ValueType>
-struct Variable : public VarExpr<Variable<ValueType>>
+struct Variable : public expr::VarExpr<Variable<ValueType>>
 {
     using value_t = ValueType;
     using pointer_t = value_t*;

diff --git a/test/distribution/bernoulli_unittest.cpp b/test/distribution/bernoulli_unittest.cpp
@@ -7,6 +7,7 @@
 #include "gtest/gtest.h"
 
 namespace ppl {
+namespace dist {
 
 struct bernoulli_dist_fixture : ::testing::Test {
 protected:
@@ -39,4 +40,5 @@ TEST_F(bernoulli_dist_fixture, bernoulli_sampling) {
     }
 }
 
-} // ppl
+} // namespace dist
+} // namespace ppl
diff --git a/test/distribution/normal_unittest.cpp b/test/distribution/normal_unittest.cpp
@@ -7,6 +7,7 @@
 #include "gtest/gtest.h"
 
 namespace ppl {
+namespace dist {
 
 struct normal_dist_fixture : ::testing::Test {
 protected:
@@ -43,4 +44,5 @@ TEST_F(normal_dist_fixture, simple_gaussian) {
     EXPECT_DOUBLE_EQ(dist2.log_pdf(4), std::log(dist1.pdf(4)));
 }
 
-} // ppl
+} // namespace dist
+} // namespace ppl
diff --git a/test/distribution/uniform_unittest.cpp b/test/distribution/uniform_unittest.cpp
@@ -7,6 +7,7 @@
 #include "gtest/gtest.h"
 
 namespace ppl {
+namespace dist {
 
 struct uniform_dist_fixture : ::testing::Test {
 protected:
@@ -49,4 +50,5 @@ TEST_F(uniform_dist_fixture, uniform_sampling) {
     }
 }
 
-} // ppl
+} // namespace dist
+} // namespace ppl
diff --git a/test/expression/model_unittest.cpp b/test/expression/model_unittest.cpp
@@ -4,6 +4,7 @@
 #include <autoppl/expression/model.hpp>
 
 namespace ppl {
+namespace expr {
 
 //////////////////////////////////////////////////////
 // Model with one RV TESTS
@@ -196,4 +197,5 @@ TEST_F(many_var_dist_fixture, four_vars)
                              + std::log(zv) + std::log(wv));
 }
 
+} // namespace expr
 } // namespace ppl