Changeset 418117a for molecuilder/src/boundary.cpp

Timestamp:

Nov 23, 2009, 6:22:33 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

3d4969

Parents:

09d3b8

Message:

Verbosity corrected for ERROR and WARNING

• present ERROR and WARNING prefixes removed and placed by eLog() and respective Verbosity().
• -v... is scanned for number of 'v's and verbosity is set accordingly
• standard verbosity is now 0.

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/boundary.cpp (modified) (14 diffs)

molecuilder/src/boundary.cpp

@@ -176 +176 @@
         angle = 0.; // otherwise it's a vector in Axis Direction and unimportant for boundary issues
 
-      //Log() << Verbose(0) << "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << "." << endl;
+      //Log() << Verbose(2) << "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << "." << endl;
       if (ProjectedVector.ScalarProduct(&AngleReferenceNormalVector) > 0) {
         angle = 2. * M_PI - angle;
@@ -214 +214 @@
     //      for(Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
     //        if (runner != BoundaryPoints[axis].begin())
-    //          Log() << Verbose(0) << ", " << i << ": " << *runner->second.second;
+    //          Log() << Verbose(2) << ", " << i << ": " << *runner->second.second;
     //        else
-    //          Log() << Verbose(0) << i << ": " << *runner->second.second;
+    //          Log() << Verbose(2) << i << ": " << *runner->second.second;
     //        i++;
     //      }
-    //      Log() << Verbose(0) << endl;
+    //      Log() << Verbose(2) << endl;
     //    }
     // 3c. throw out points whose distance is less than the mean of left and right neighbours
@@ -249 +249 @@
           SideA.SubtractVector(MolCenter);
           SideA.ProjectOntoPlane(&AxisVector);
-          //          Log() << Verbose(0) << "SideA: ";
-          //          SideA.Output(out);
-          //          Log() << Verbose(0) << endl;
+          //          Log() << Verbose(0) << "SideA: " << SideA << endl;
 
           SideB.CopyVector(&right->second.second->x);
           SideB.SubtractVector(MolCenter);
           SideB.ProjectOntoPlane(&AxisVector);
-          //          Log() << Verbose(0) << "SideB: ";
-          //          SideB.Output(out);
-          //          Log() << Verbose(0) << endl;
+          //          Log() << Verbose(0) << "SideB: " << SideB << endl;
 
           SideC.CopyVector(&left->second.second->x);
           SideC.SubtractVector(&right->second.second->x);
           SideC.ProjectOntoPlane(&AxisVector);
-          //          Log() << Verbose(0) << "SideC: ";
-          //          SideC.Output(out);
-          //          Log() << Verbose(0) << endl;
+          //          Log() << Verbose(0) << "SideC: " << SideC << endl;
 
           SideH.CopyVector(&runner->second.second->x);
           SideH.SubtractVector(MolCenter);
           SideH.ProjectOntoPlane(&AxisVector);
-          //          Log() << Verbose(0) << "SideH: ";
-          //          SideH.Output(out);
-          //          Log() << Verbose(0) << endl;
+          //          Log() << Verbose(0) << "SideH: " << SideH << endl;
 
           // calculate each length
@@ -335 +327 @@
       for(Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
         if (runner != BoundaryPoints[axis].begin())
-          Log() << Verbose(0) << ", " << i << ": " << *runner->second.second;
+          Log() << Verbose(2) << ", " << i << ": " << *runner->second.second;
         else
-          Log() << Verbose(0) << i << ": " << *runner->second.second;
+          Log() << Verbose(2) << i << ": " << *runner->second.second;
         i++;
       }
-      Log() << Verbose(0) << endl;
+      Log() << Verbose(2) << endl;
     }
 
@@ -347 +339 @@
     for (Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++)
         if (!TesselStruct->AddBoundaryPoint(runner->second.second, 0))
-          Log() << Verbose(3) << "WARNING: Point " << *(runner->second.second) << " is already present!" << endl;
+          eLog() << Verbose(2) << "Point " << *(runner->second.second) << " is already present!" << endl;
 
   Log() << Verbose(2) << "I found " << TesselStruct->PointsOnBoundaryCount << " points on the convex boundary." << endl;
@@ -355 +347 @@
   //  Log() << Verbose(1) << "Listing PointsOnBoundary:";
   //  for(PointMap::iterator runner = PointsOnBoundary.begin(); runner != PointsOnBoundary.end(); runner++) {
-  //    Log() << Verbose(0) << " " << *runner->second;
+  //    Log() << Verbose(1) << " " << *runner->second;
   //  }
-  //  Log() << Verbose(0) << endl;
+  //  Log() << Verbose(1) << endl;
 
   // 3a. guess starting triangle
@@ -406 +398 @@
         // flip the line
         if (TesselStruct->PickFarthestofTwoBaselines(line) == 0.)
-          Log() << Verbose(1) << "ERROR: Correction of concave baselines failed!" << endl;
+          eLog() << Verbose(1) << "Correction of concave baselines failed!" << endl;
         else {
           TesselStruct->FlipBaseline(line);
@@ -462 +454 @@
 
   if ((TesselStruct == NULL) || (TesselStruct->PointsOnBoundary.empty())) {
-    Log() << Verbose(2) << "ERROR: TesselStruct is empty." << endl;
+    eLog() << Verbose(1) << "TesselStruct is empty." << endl;
     return false;
   }
@@ -470 +462 @@
     Log() << Verbose(2) << "Remaining points are: ";
     for (PointMap::iterator PointSprinter = TesselStruct->PointsOnBoundary.begin(); PointSprinter != TesselStruct->PointsOnBoundary.end(); PointSprinter++)
-      Log() << Verbose(0) << *(PointSprinter->second) << "\t";
-    Log() << Verbose(0) << endl;
+      Log() << Verbose(2) << *(PointSprinter->second) << "\t";
+    Log() << Verbose(2) << endl;
 
     PointRunner = TesselStruct->PointsOnBoundary.begin();
@@ -528 +520 @@
   // check whether there is something to work on
   if (TesselStruct == NULL) {
-    Log() << Verbose(1) << "ERROR: TesselStruct is empty!" << endl;
+    eLog() << Verbose(1) << "TesselStruct is empty!" << endl;
     return volume;
   }
@@ -756 +748 @@
   Log() << Verbose(1) << "Minimum volume of the convex envelope contained in a rectangular box is " << minimumvolume << " atomicmassunit/" << (IsAngstroem ? "angstrom" : "atomiclength") << "^3." << endl;
   if (minimumvolume > cellvolume) {
-    eLog() << Verbose(0) << "ERROR: the containing box already has a greater volume than the envisaged cell volume!" << endl;
+    eLog() << Verbose(1) << "the containing box already has a greater volume than the envisaged cell volume!" << endl;
     Log() << Verbose(0) << "Setting Box dimensions to minimum possible, the greatest diameters." << endl;
     for (int i = 0; i < NDIM; i++)
@@ -849 +841 @@
   for(int i=0;i<NDIM;i++) {
     N[i] = (int) ceil(1./FillerDistance.x[i]);
-    Log() << Verbose(0) << N[i];
+    Log() << Verbose(1) << N[i];
     if (i != NDIM-1)
-      Log() << Verbose(0)<< ", ";
+      Log() << Verbose(1)<< ", ";
     else
-      Log() << Verbose(0) << "." << endl;
+      Log() << Verbose(1) << "." << endl;
   }
 
@@ -870 +862 @@
           // get linked cell list
           if (TesselStruct[i] == NULL) {
-            Log() << Verbose(1) << "ERROR: TesselStruct of " << (*ListRunner) << " is NULL. Didn't we pre-create it?" << endl;
+            eLog() << Verbose(1) << "TesselStruct of " << (*ListRunner) << " is NULL. Didn't we pre-create it?" << endl;
             FillIt = false;
           } else {
@@ -1015 +1007 @@
       //Log() << Verbose(1) << "Line " << *baseline->second << " has " << baseline->second->triangles.size() << " triangles adjacent" << endl;
       if (baseline->second->triangles.size() != 2)
-        eLog() << Verbose(1) << "TESSELATION FINISHED WITH INVALID TRIANGLE COUNT!" << endl;
+        eLog() << Verbose(0) << "TESSELATION FINISHED WITH INVALID TRIANGLE COUNT!" << endl;
     }