Better TableView

jedbrown · Mar 8, 2011 · 264357d · 264357d
1 parent 15fdd50
commit 264357d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 19 deletions.
diff --git a/include/dohp.h b/include/dohp.h
@@ -69,8 +69,8 @@
 #define dStrlen(s,l) PetscStrlen((s),(l))
 extern dErr dObjectGetComm(dObject obj,MPI_Comm *comm);
 
-extern dErr dRealTableView(dInt m,dInt n,const dReal mat[],const char *name,dViewer viewer);
-extern dErr dIntTableView(dInt m,dInt n,const dInt mat[],const char *name,dViewer viewer);
+extern dErr dRealTableView(dInt m,dInt n,const dReal mat[],dViewer viewer,const char *format,...);
+extern dErr dIntTableView(dInt m,dInt n,const dInt mat[],dViewer viewer,const char *format,...);
 
 static inline dInt dMaxInt(dInt a,dInt b) { return (a > b) ? a : b; }
 static inline dInt dMinInt(dInt a,dInt b) { return (a < b) ? a : b; }

diff --git a/src/jacobi/impls/modal/modaltopo.c b/src/jacobi/impls/modal/modaltopo.c
@@ -11,8 +11,8 @@ static dErr ModalBasisView(dInt Q,dInt P,const dReal interp[],const dReal deriv[
   err = PetscTypeCompare((PetscObject)viewer,PETSCVIEWERASCII,&ascii);dCHK(err);
   if (!ascii) dFunctionReturn(0);
   err = PetscViewerASCIIPrintf(viewer,"Modal basis with %d point rule and %d point basis.\n",Q,P);dCHK(err);
-  err = dRealTableView(Q,P,interp,"interp",viewer);dCHK(err);
-  err = dRealTableView(Q,3*P,deriv,"deriv",viewer);dCHK(err);
+  err = dRealTableView(Q,P,interp,viewer,"interp");dCHK(err);
+  err = dRealTableView(Q,3*P,deriv,viewer,"deriv");dCHK(err);
   dFunctionReturn(0);
 }
 

diff --git a/src/jacobi/impls/tensor/tensor.c b/src/jacobi/impls/tensor/tensor.c
@@ -126,9 +126,9 @@ dErr TensorBasisView(const TensorBasis basis,PetscViewer viewer) /* exported so
   err = PetscTypeCompare((PetscObject)viewer,PETSCVIEWERASCII,&ascii);dCHK(err);
   if (!ascii) dFunctionReturn(0);
   err = PetscViewerASCIIPrintf(viewer,"TensorBasis with rule=%d basis=%d.\n",basis->Q,basis->P);dCHK(err);
-  err = dRealTableView(basis->Q,basis->P,basis->interp,"interp",viewer);dCHK(err);
-  err = dRealTableView(basis->Q,3*basis->P,basis->deriv,"deriv",viewer);dCHK(err);
-  err = dRealTableView(1,basis->P,basis->node,"node",viewer);dCHK(err);
+  err = dRealTableView(basis->Q,basis->P,basis->interp,viewer,"interp");dCHK(err);
+  err = dRealTableView(basis->Q,basis->P,basis->deriv,viewer,"deriv");dCHK(err);
+  err = dRealTableView(1,basis->P,basis->node,viewer,"node");dCHK(err);
   dFunctionReturn(0);
 }
 

diff --git a/src/jacobi/quadrature/impls/tensor/tensorquad.c b/src/jacobi/quadrature/impls/tensor/tensorquad.c
@@ -12,8 +12,8 @@ dErr TensorRuleView(TensorRule rule,PetscViewer viewer)
   err = PetscTypeCompare((PetscObject)viewer,PETSCVIEWERASCII,&ascii);dCHK(err);
   if (!ascii) dFunctionReturn(0);
   err = PetscViewerASCIIPrintf(viewer,"TensorRule with %d nodes.\n",rule->size);dCHK(err);
-  err = dRealTableView(1,rule->size,rule->coord,"q",viewer);dCHK(err);
-  err = dRealTableView(1,rule->size,rule->weight,"w",viewer);dCHK(err);
+  err = dRealTableView(1,rule->size,rule->coord,viewer,"q");dCHK(err);
+  err = dRealTableView(1,rule->size,rule->weight,viewer,"w");dCHK(err);
   dFunctionReturn(0);
 }
 

diff --git a/src/jacobi/tests/ex4.c b/src/jacobi/tests/ex4.c
@@ -38,8 +38,8 @@ static dErr TestPatches(dJacobi jac,PetscViewer viewer)
     err = dRuleGetPatches(rule,&npatches,&patchsize,&ind,&weight);dCHK(err);
     if (npatches*patchsize != tsize[0]*tsize[1]*tsize[2]) dERROR(PETSC_COMM_SELF,PETSC_ERR_PLIB,"Inconsistent patch sizes");
     err = PetscViewerASCIIPrintf(viewer,"Element %D: npatches %D  patchsize %D\n",i,npatches,patchsize);dCHK(err);
-    err = dIntTableView(npatches,patchsize,ind,"indices",viewer);dCHK(err);
-    err = dRealTableView(npatches,patchsize,weight,"weights",viewer);dCHK(err);
+    err = dIntTableView(npatches,patchsize,ind,viewer,"indices");dCHK(err);
+    err = dRealTableView(npatches,patchsize,weight,viewer,"weights");dCHK(err);
   }
   err = dFree(rules);dCHK(err);
   err = dFree(efs);dCHK(err);

diff --git a/src/util/util.c b/src/util/util.c
@@ -28,22 +28,25 @@ dErr dStrcpyS(char dest[restrict],size_t n,const char src[restrict])
 dErr dObjectGetComm(dObject obj,MPI_Comm *comm)
 { return PetscObjectGetComm(obj,comm); }
 
-dErr dRealTableView(dInt m,dInt n,const dReal mat[],const char *name,dViewer viewer)
+dErr dRealTableView(dInt m,dInt n,const dReal mat[],dViewer viewer,const char *format,...)
 {
+  va_list Argp;
+  size_t fullLen;
+  char name[4096];
   dBool ascii;
   dErr err;
 
   dFunctionBegin;
+  va_start(Argp,format);
+  err = PetscVSNPrintf(name,sizeof name,format,&fullLen,Argp);dCHK(err);
   err = PetscTypeCompare((PetscObject)viewer,PETSCVIEWERASCII,&ascii);dCHK(err);
   if (!ascii) dFunctionReturn(0);
   if (!mat) {
     err = PetscViewerASCIIPrintf(viewer,"%10s: null %D*%D\n",name,m,n);dCHK(err);
     dFunctionReturn(0);
   }
   for (dInt i=0; i<m; i++) {
-    if (name) {
-      err = PetscViewerASCIIPrintf(viewer,"%10s[%2d][%2d:%2d] ",name,i,0,n);dCHK(err);
-    }
+    err = PetscViewerASCIIPrintf(viewer,"%10s[%2d][%2d:%2d] ",name,i,0,n);dCHK(err);
     err = PetscViewerASCIIUseTabs(viewer,PETSC_FALSE);dCHK(err);
     for (dInt j=0; j<n; j++) {
       err = PetscViewerASCIIPrintf(viewer," % 9.5f",mat[i*n+j]);dCHK(err);
@@ -54,22 +57,25 @@ dErr dRealTableView(dInt m,dInt n,const dReal mat[],const char *name,dViewer vie
   dFunctionReturn(0);
 }
 
-dErr dIntTableView(dInt m,dInt n,const dInt mat[],const char *name,dViewer viewer)
+dErr dIntTableView(dInt m,dInt n,const dInt mat[],dViewer viewer,const char *format,...)
 {
+  va_list Argp;
+  size_t fullLen;
+  char name[4096];
   dBool ascii;
   dErr err;
 
   dFunctionBegin;
+  va_start(Argp,format);
+  err = PetscVSNPrintf(name,sizeof name,format,&fullLen,Argp);dCHK(err);
   err = PetscTypeCompare((PetscObject)viewer,PETSCVIEWERASCII,&ascii);dCHK(err);
   if (!ascii) dFunctionReturn(0);
   if (!mat) {
     err = PetscViewerASCIIPrintf(viewer,"%10s: null %D*%D\n",name,m,n);dCHK(err);
     dFunctionReturn(0);
   }
   for (dInt i=0; i<m; i++) {
-    if (name) {
-      err = PetscViewerASCIIPrintf(viewer,"%10s[%2d][%2d:%2d] ",name,i,0,n);dCHK(err);
-    }
+    err = PetscViewerASCIIPrintf(viewer,"%10s[%2d][%2d:%2d] ",name,i,0,n);dCHK(err);
     err = PetscViewerASCIIUseTabs(viewer,PETSC_FALSE);dCHK(err);
     for (dInt j=0; j<n; j++) {
       err = PetscViewerASCIIPrintf(viewer," %3D",mat[i*n+j]);dCHK(err);