Changeset 1884035 in tol

Timestamp:

Mar 11, 2009, 3:45:51 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f2ee099

Parents:

5caf40f

Message:

Ensuring subtype is triplet and items is not empty in method BVMat::MergeRows

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

File:

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

tol/btol/vmatrix_type/vmat.cpp

@@ -885 +885 @@
   BArray<BVMat*> a_(N); 
   BArray< BArray<int> > rowIndex(N);
-  int ncol;
+  int ncol=0;
   for(n=0; n<N; n++)
   {
@@ -914 +914 @@
       continue;
     }
-    a_[n] = a[n];
+    if(a[n]->code_ == ESC_chlmRtriplet) 
+    {
+      a_[n] = a[n];
+    }
+    else
+    { 
+      a_[n] = new BVMat;
+      a_[n]->Convert(*a[n], ESC_chlmRtriplet);
+    }
     if(!n) { ncol = a_[n]->s_.chlmRtriplet_->ncol; }
     else if (ncol != a_[n]->s_.chlmRtriplet_->ncol)
@@ -920 +928 @@
       err_cannot_create(fName, 
         BText("Number of columns is not equal to previous for item number ")+(n+1));
-      result = -4;
+      result = -5;
       continue;
     }
@@ -930 +938 @@
       err_cannot_create(fName, 
         BText("Number of rows is not equal to card of row indexes at item number ")+(n+1));
-      result = -5;
+      result = -6;
       continue;
-    }
-    if(a[n]->code_ != ESC_chlmRtriplet) 
-    { 
-      BVMat* a__ = new BVMat;
-      a__->Convert(*a[n], ESC_chlmRtriplet);
-      a_[n] = a__;
     }
     if(a_[n]->s_.chlmRtriplet_->nnz)
@@ -969 +971 @@
     }
   }
-  else
-  {
+  else if(N)
+  {
+    assert(ncol);
     ChlmRTriplet(nrow, ncol, nzmax);
     s_.chlmRtriplet_->nnz = nnz;