TetEdge: debugging

FunctionSpace/BasisScalar.cpp

@@ -13,26 +13,27 @@ BasisScalar::~BasisScalar(void){
 string BasisScalar::toString(void) const{
   stringstream stream;
   unsigned int i = 0;
+  const unsigned int refSpace = 0;
 
   stream << "Vertex Based:" << endl;
   for(; i < nVertex; i++)
     stream << "f("  << i + 1                       << ") = "
-	   << (*(*basis)[0])[i]->toString() << endl;
+	   << (*(*basis)[refSpace])[i]->toString() << endl;
 
   stream << "Edge Based:"   << endl;
   for(; i < nVertex + nEdge; i++)
     stream << "f(" << i + 1                        << ") = " 
-	   << (*(*basis)[0])[i]->toString() << endl;
+	   << (*(*basis)[refSpace])[i]->toString() << endl;
 
   stream << "Face Based:"   << endl;
   for(; i < nVertex + nEdge + nFace; i++)
     stream << "f(" << i + 1                        << ") = " 
-	   << (*(*basis)[0])[i]->toString() << endl;
+	   << (*(*basis)[refSpace])[i]->toString() << endl;
 
   stream << "Cell Based:"   << endl;
   for(; i < nVertex + nEdge + nFace + nCell; i++)
     stream << "f("  << i + 1                       << ") = " 
-	   << (*(*basis)[0])[i]->toString() << endl;
+	   << (*(*basis)[refSpace])[i]->toString() << endl;
 
   return stream.str();
 }

FunctionSpace/BasisVector.cpp

@@ -13,34 +13,35 @@ BasisVector::~BasisVector(void){
 string BasisVector::toString(void) const{
   stringstream stream;
   unsigned int i = 0;
+  const unsigned int refSpace = 0;
 
   stream << "Vertex Based:" << endl;
   for(; i < nVertex; i++)
     stream << "f("   << i + 1                                     << ") = " << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[0].toString() << " ]"   << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[1].toString() << " ]"   << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[2].toString() << " ]"   << endl;
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[0].toString() << " ]"   << endl
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[1].toString() << " ]"   << endl
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[2].toString() << " ]"   << endl;
 
   stream << "Edge Based:"   << endl;
   for(; i < nVertex + nEdge; i++)
     stream << " f("  << i + 1                                     << ") = " << endl 
-	   << "\t[ " << (*(*(*basis)[0])[i])[0].toString() << " ]"   << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[1].toString() << " ]"   << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[2].toString() << " ]"   << endl;
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[0].toString() << " ]"   << endl
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[1].toString() << " ]"   << endl
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[2].toString() << " ]"   << endl;
 
   stream << "Face Based:"   << endl;
   for(; i < nVertex + nEdge + nFace; i++)
     stream << " f("  << i + 1                                     << ") = " << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[0].toString() << " ]"   << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[1].toString() << " ]"   << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[2].toString() << " ]"   << endl;
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[0].toString() << " ]"   << endl
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[1].toString() << " ]"   << endl
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[2].toString() << " ]"   << endl;
   
   stream << "Cell Based:"   << endl;
   for(; i < nVertex + nEdge + nFace + nCell; i++)
     stream << " f("  << i + 1                                     << ") = " << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[0].toString() << " ]"   << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[1].toString() << " ]"   << endl
-	   << "\t[ " << (*(*(*basis)[0])[i])[2].toString() << " ]"   << endl;
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[0].toString() << " ]"   << endl
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[1].toString() << " ]"   << endl
+	   << "\t[ " << (*(*(*basis)[refSpace])[i])[2].toString() << " ]"   << endl;
 
   return stream.str();
 }

FunctionSpace/EvaluatedBasis.h

@@ -100,12 +100,6 @@ EvaluatedBasis::getEvaluation(unsigned int refSpace) const{
 
 inline const fullMatrix<double>& 
 EvaluatedBasis::getEvaluation(const MElement& element) const{
-  /*
-  std::cout << element.getNum() 
-	    << ": "
-	    << refSpace->getReferenceSpace(element)
-	    << std::endl;
-  */
   return *(*eBasis)[refSpace->getReferenceSpace(element)];
 }
 

FunctionSpace/ReferenceSpace.cpp

@@ -288,7 +288,7 @@ string ReferenceSpace::toString(void) const{
   stream << toString(&pTreeRoot) << endl;
 
   // ReferenceSpaces //
-  stream << "ReferenceSpace:" << endl;
+  stream << "Reference Spaces:" << endl;
   
   for(unsigned int i = 0; i < nPerm; i++){
     stream << "  * ";
@@ -299,6 +299,29 @@ string ReferenceSpace::toString(void) const{
     stream << " (# " << i + 1 << ")" << endl;
   }
 
+  stream << "Edges Permutations:" << endl;
+  
+  for(unsigned int i = 0; i < nPerm; i++){
+    stream << "  * RefSpace #" << i + 1 << ":" << endl;
+    
+    for(unsigned int j = 0; j < nEdge; j++)
+      stream << "      -- [" 
+	     << edge->at(i)->at(j)->at(0) << ", "
+	     << edge->at(i)->at(j)->at(1) << "]" << endl;
+  }
+
+  stream << "Faces Permutations:" << endl;
+  
+  for(unsigned int i = 0; i < nPerm; i++){
+    stream << "  * RefSpace #" << i + 1 << ":" << endl;
+    
+    for(unsigned int j = 0; j < nFace; j++)
+      stream << "      -- [" 
+	     << face->at(i)->at(j)->at(0) << ", "
+	     << face->at(i)->at(j)->at(1) << ", "
+	     << face->at(i)->at(j)->at(2) << "]" << endl;
+  }
+
   return stream.str();
 }