Changeset 04e6eaf in tol

Timestamp:

Sep 19, 2012, 8:48:20 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

43cd166

Parents:

45b1fd8

Message:

Ensuring positiveness of matrix dimensions

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

File:

• tol/btol/vmatrix_type/vmatgra.cpp (modified) (12 diffs)

tol/btol/vmatrix_type/vmatgra.cpp

@@ -320 +320 @@
 {
   BVMat& v = VMat(Arg(1));
-  int nrow = (int)Real(Arg(2));
-  int ncol = (int)Real(Arg(3));
+  int nrow = max(0,(int)Real(Arg(2)));
+  int ncol = max(0,(int)Real(Arg(3)));
   int row0 = (int)Real(Arg(4))-1;
   int col0 = (int)Real(Arg(5))-1;
@@ -342 +342 @@
 //--------------------------------------------------------------------
 {
-  int nrow = (int)Real(Arg(1));
+  int nrow = max(0,(int)Real(Arg(1)));
   BSet& items = Set(Arg(2));
   contens_.MergeRows(nrow, items);
@@ -562 +562 @@
 { 
   BSyntaxObject* ijx_ = Arg(1);
-  int nrow = (int)Real(Arg(2));
-  int ncol = (int)Real(Arg(3));
+  int nrow = max(0,(int)Real(Arg(2)));
+  int ncol = max(0,(int)Real(Arg(3)));
   BMatrix<double> ijx;
   if(ijx_->Grammar()==GraMatrix())
@@ -681 +681 @@
 { 
   BMatrix<double>& ijx = (BMatrix<double>&)Mat(Arg(1));
-  int nrow = (int)Real(Arg(2));
-  int ncol = (int)Real(Arg(3));
+  int nrow = max(0,(int)Real(Arg(2)));
+  int ncol = max(0,(int)Real(Arg(3)));
   contens_.DMat2tripletUnique(ijx,nrow,ncol);
 }
@@ -725 +725 @@
 {
   BPolyn<BDat>& pol = Pol(Arg(1));
-  register int r = (BInt)Real(Arg(2));
-  register int c = (BInt)Real(Arg(3));
+  register int r = max(0,(BInt)Real(Arg(2)));
+  register int c = max(0,(BInt)Real(Arg(3)));
   contens_.BPol2sparse(pol, r, c);
   assert(contens_.Check());
@@ -744 +744 @@
 //--------------------------------------------------------------------
 {
-  int r = (BInt)Real(Arg(1));
-  int c = (BInt)Real(Arg(2));
+  int r = max(0,(BInt)Real(Arg(1)));
+  int c = max(0,(BInt)Real(Arg(2)));
   double v = Real(Arg(3));
   contens_.BlasRDense(r,c, v);
@@ -765 +765 @@
 //--------------------------------------------------------------------
 {
-  int nrow = (int)Real(Arg(1));
+  int nrow = max(0,(int)Real(Arg(1)));
   int ncol = nrow;
   BVMat::ECode code = BVMat::ESC_chlmRsparse; 
-  if(Arg(2)) { ncol = (int)Real(Arg(2)); }
+  if(Arg(2)) { ncol = max(0,(int)Real(Arg(2))); }
   if(Arg(3)) { code = BVMat::FindCodeName(Text(Arg(3))); }
   contens_.Zeros(nrow,ncol,code);
@@ -796 +796 @@
 //--------------------------------------------------------------------
 {
-  int nrow = (int)Real(Arg(1));
+  int nrow = max(0,(int)Real(Arg(1)));
   int ncol = nrow;
-  if(Arg(2)) { ncol=(int)Real(Arg(2)); }
+  if(Arg(2)) { ncol=max(0,(int)Real(Arg(2))); }
   if(!Arg(3)) 
   { 
@@ -805 +805 @@
   else
   {
-    int diag = (int)Real(Arg(3));
+    int diag = max(0,(int)Real(Arg(3)));
     BSyntaxObject* x_ = Arg(4);
     bool isReal = !x_;
@@ -2469 +2469 @@
 //--------------------------------------------------------------------
 {
-  int    nrow = (int)Real(Arg(1));
-  int    ncol = (int)Real(Arg(2));
+  int    nrow = max(0,(int)Real(Arg(1)));
+  int    ncol = max(0,(int)Real(Arg(2)));
   double min  = Real(Arg(3));
   double max  = Real(Arg(4));
@@ -2501 +2501 @@
 //--------------------------------------------------------------------
 {
-  int    nrow = (int)Real(Arg(1));
-  int    ncol = (int)Real(Arg(2));
+  int    nrow = max(0,(int)Real(Arg(1)));
+  int    ncol = max(0,(int)Real(Arg(2)));
   double nu   = Real(Arg(3));
   double sig  = Real(Arg(4));
@@ -2543 +2543 @@
   int burn = 0;
   double borderDistance = 0.001;
-  if(Arg(4)) { ncol = (int)Real(Arg(4)); }
+  if(Arg(4)) { max(0,ncol = (int)Real(Arg(4))); }
   if(Arg(5)) { burn = (int)Real(Arg(5)); }
   if(Arg(6)) { burn = (int)Real(Arg(6)); }