added addition to composite parameter

diyabc · Sep 24, 2023 · a9abe2f · a9abe2f
1 parent c1daeef
commit a9abe2f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/EstimParam.cpp b/src/EstimParam.cpp
@@ -94,6 +94,9 @@ EstimParamResults EstimParam_fun(Reftable<MatrixType> &myread,
     case op_type::multiply:
         y = myread.params(all, p1) * myread.params(all, p2);
         break;
+    case op_type::add:
+        y = myread.params(all, p1) + myread.params(all, p2);
+        break;
     }
 
     // myread.params = std::move(myread.params(indexesModel,param_num)).eval();

diff --git a/src/parse_parexpr.cpp b/src/parse_parexpr.cpp
@@ -38,6 +38,8 @@ void parse_paramexpression(const std::vector<std::string>& params_str,
                     op = op_type::multiply;
                 else if(base_match[4].str()[0] == '/')
                     op = op_type::divide;
+                else if(base_match[4].str()[0] == '+')
+                    op = op_type::add;
                 else {
                     std::cout << "Wrong parameter composition : " << base_match[4].str() << std::endl;
                     exit(1);

diff --git a/src/parse_parexpr.hpp b/src/parse_parexpr.hpp
@@ -8,7 +8,8 @@ enum op_type
 {
     none,
     divide,
-    multiply
+    multiply,
+    add
 };
 
 void parse_paramexpression(const std::vector<std::string>& params_str,
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,8 @@ enum op_type @@
     {
         none,
         divide,
-        multiply
+        multiply,
+        add
     };
     void parse_paramexpression(const std::vector<std::string>& params_str,
@@ Expand Down @@