Changeset b2c33bb in tol

Timestamp:

Jan 19, 2009, 8:50:02 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

567228f

Parents:

095d51c

Message:

Fixing some Struct field types.
Allowing '?' as lower or upper bound of prior distribution of missing values.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@425 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/vmatrix_type/vmat_bsr.cpp (modified) (5 diffs)

tol/btol/vmatrix_type/vmat_bsr.cpp

@@ -101 +101 @@
     "Text:Session.Description,"
     "Text:Session.Authors,"
-    "Text:Session.Creation,"
+    "Date:Session.Creation,"
     "Text:Path");
   }
@@ -137 +137 @@
     "Real:Row,"
     "Real:Col,"
-    "Real:Prior,"
+    "Text:Prior,"
     "Real:Nu,"
     "Real:Sigma2,"
@@ -403 +403 @@
 template<> symbol_handler<sigma_info>*     add_symbol<sigma_info>     ::sh_   = NULL;
 template<> symbol_handler<noise_info>* add_symbol<noise_info> ::sh_   = NULL;
+
+
+///////////////////////////////////////////////////////////////////////////////
+struct assign_missing_min
+///////////////////////////////////////////////////////////////////////////////
+{
+  static symbol_handler<missing_info>*  mis_;
+  
+  static void action(const double d)
+  {
+    mis_->info.minBound  = d;
+  }
+  static void action(const std::string& str)
+  {
+    if(str=="?")
+    {
+      action(BDat::NegInf());
+    }
+    else
+    {
+      action(atof(str.c_str()));
+    }
+  }
+  void operator()(const double d) const
+  {
+    action(d);
+  }
+  void operator()(const std::string& str) const
+  {
+    action(str);
+  }
+  void operator()(const char* str) const
+  {
+    action(str);
+  }
+  template<typename IteratorT>
+  void operator()(IteratorT first, IteratorT last) const
+  {
+    std::string str;
+    str.assign(first, last);
+    action(str);
+  }
+};
+symbol_handler<missing_info>* assign_missing_min::mis_  = NULL; 
+
+///////////////////////////////////////////////////////////////////////////////
+struct assign_missing_max
+///////////////////////////////////////////////////////////////////////////////
+{
+  static symbol_handler<missing_info>*  mis_;
+  
+  static void action(const double d)
+  {
+    mis_->info.maxBound  = d;
+  }
+  static void action(const std::string& str)
+  {
+    if(str=="?")
+    {
+      action(BDat::PosInf());
+    }
+    else
+    {
+      action(atof(str.c_str()));
+    }
+  }
+  void operator()(const double d) const
+  {
+    action(d);
+  }
+  void operator()(const char* str) const
+  {
+    action(str);
+  }
+  void operator()(const std::string& str) const
+  {
+    action(str);
+  }
+  template<typename IteratorT>
+  void operator()(IteratorT first, IteratorT last) const
+  {
+    std::string str;
+    str.assign(first, last);
+    action(str);
+  }
+};
+symbol_handler<missing_info>* assign_missing_max::mis_  = NULL; 
 
 
@@ -1187 +1274 @@
       add_symbol<noise_info>::sh_ = &s.noise;
       add_symbol<noise_info> add_res;
+
+      assign_missing_min::mis_  = &s.mis; 
+      assign_missing_min assign_missing_min_; 
+      assign_missing_max::mis_  = &s.mis; 
+      assign_missing_max assign_missing_max_; 
 
       assign_noise_size::noise_info_  = &s.noise.info; 
@@ -1605 +1697 @@
                 (real_p[assign_a(s.mis.info.sigma2)] | error_badNumber)>>
                 argumentSeparator >>
-                (real_p[assign_a(s.mis.info.minBound)] | error_badNumber)>>
+                ((str_p("?")|real_p)[assign_missing_min_] | error_badNumber) >>
                 argumentSeparator >>
-                (real_p[assign_a(s.mis.info.maxBound)] | error_badNumber) >>
+                ((str_p("?")|real_p)[assign_missing_max_] | error_badNumber) >>
                 closeParenthesys
               )