refactored naming

CMakeLists.txt

@@ -92,7 +92,6 @@ set(INCLUDE_PATHS
   ${CMAKE_CURRENT_LIST_DIR}/lib/math/lib/eigen_3.3.9
   ${TBB_ROOT}/include
   ${CMAKE_CURRENT_LIST_DIR}/lib/math/lib/sundials_5.5.0/include
-  # TBB already included
   ${CMAKE_CURRENT_BINARY_DIR}
   ${protobuf_SOURCE_DIR}/src
 )

src/proto/algorithm_state.proto

@@ -45,7 +45,6 @@ message AlgorithmState {
       MultiNormalIGDistribution lin_reg_uni_state = 4;
       NxIGDistribution nnxig_state = 5;
       FAPriorDistribution fa_state = 7;
-      Vector python_state = 8;
     }
   }
   HierarchyHypers hierarchy_hypers = 5; // The current values of the hyperparameters of the hierarchy

src/proto/hierarchy_id.proto

@@ -13,5 +13,5 @@ enum HierarchyId {
     LapNIG = 4; // Laplace - Normal Inverse Gamma
     FA = 5; // Factor Analysers
     NNxIG = 6; // Normal - Normal x Inverse Gamma
-    Python_h = 7; // Generic python hierarchy
+    PythonHier = 7; // Generic python hierarchy
 }

src/proto/hierarchy_prior.proto

@@ -115,7 +115,10 @@ message EmptyPrior {
   double fake_field = 1;
 }
 
-message Python_hPrior{
+/*
+ * Definition of a generic container for the prior parameters to be used in Python
+ */
+message PythonHierPrior{
   oneof prior {
     Vector values = 1; // values are modified from python
   }

src/proto/mixing_id.proto

@@ -12,5 +12,5 @@ enum MixingId {
     LogSB = 3; // Logit Stick-Breaking Process
     TruncSB = 4; // Truncated Stick-Breaking Process
     MFM = 5; // Mixture of finite mixtures
-    Python_m = 6; // Generic python mixing
+    PythonMix = 6; // Generic python mixing
 }

src/proto/mixing_prior.proto

@@ -51,7 +51,10 @@ message LogSBPrior {
   uint32 num_components = 3; // Number of components in the process
 }
 
-message Python_mPrior {
+/*
+ * Definition of a generic container for the prior parameters to be used in Python
+ */
+message PythonMixPrior {
   oneof prior {
     Vector values = 1;
   }
@@ -84,7 +87,7 @@ message TruncSBPrior {
     DPPrior dp_prior = 2; // Truncated Dirichlet process
     PYPrior py_prior = 3; // Truncated Pitman-Yor process
     MFMPrior mfm_prior = 5;
-    Python_mPrior pm_prior = 6;
+    PythonMixPrior pm_prior = 6;
   }
   uint32 num_components = 4; // Number of components in the process
 }