Changeset abbbbef in tol

Timestamp:

Mar 6, 2012, 9:35:28 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

3c5b71c

Parents:

bb3467e

Message:

Fixes #1464

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

Location:

tol/btol/vmatrix_type

Files:

• tol_bvmat_bsr_impl.h (modified) (1 diff)
• vmat_bsr_primary.cpp (modified) (2 diffs)

tol/btol/vmatrix_type/tol_bvmat_bsr_impl.h

@@ -800 +800 @@
   //Std(BText("\nassign_sigma_to_noise(")+str.c_str()+")");
   //Std(BText("sigmaIdx=")+sigInf->index);
-    t->noise_info_->sigmaName = sigInf.name;
-    t->noise_info_->sigmaIdx = sigInf.index;
-    t->noise_info_->sigmaCte = BDat::Nan();
+    if(!noise_info_->size)
+    {
+      Warning(BSR()+"Cannot define a variance parameter "+
+        sigInf.name.c_str()+" over an empty noise. It will be skyped.");
+      t->noise_info_->sigmaName = "";
+      t->noise_info_->sigmaIdx = -1;
+    }
+    else
+    {
+      t->noise_info_->sigmaName = sigInf.name;
+      t->noise_info_->sigmaIdx = sigInf.index;
+    }
+    t->noise_info_->sigmaCte = BDat::Nan();  
     t->noise_info_->sigPriExpr = "";
     t->noise_info_->cov.Eye(noise_info_->size,noise_info_->size,0,1);

tol/btol/vmatrix_type/vmat_bsr_primary.cpp

@@ -563 +563 @@
     if(!b)
     {
-      Error(BSR()+"At least a vector of noise with independent normal distribution must be defined");
+      Error(BSR()+"There are no defined noise");
       return(-4);
     }
-    if(!m)
-    {
-      Error(BSR()+"At least a linear equation must be defined");
+    else if(b>1)
+    {
+      Error(BSR()+"There are more than one defined noise");
+      return(-4);
+    }
+    else if(noise.vec[0].size!=m)
+    {
+      Error(BSR()+"There are "+m+" linear equations but noise is defined "
+              "with length "<<noise.vec[0].size);
       return(-5);
+    }
+    else if(!m)
+    {
+      Warning(BSR()+"Segment has no linear equation");
     }
     return(0);
@@ -591 +601 @@
     int r = ine_vec.size();
     if(!n && !X_.Rows()) { X_.BlasRDense(m,0); }
+    if(!m) { m = X.Rows(); }
   //Std(BSR()+" Building model definition of primary module\n");
     int result = checkDimensions(m);