Changeset 11473 for OpenSceneGraph/trunk/src/osgUtil/Simplifier.cpp

Timestamp:

05/28/10 17:51:00 (3 years ago)

Author:

robert

Message:

Conversion of osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgUtil/Simplifier.cpp (modified) (36 diffs)

OpenSceneGraph/trunk/src/osgUtil/Simplifier.cpp

@@ -94 +94 @@
         if (p1==0 || p2==0)
         {
-            osg::notify(osg::NOTICE)<<"Error computeInterpolatedPoint("<<edge<<",r) p1 and/or p2==0"<<std::endl;
+            OSG_NOTICE<<"Error computeInterpolatedPoint("<<edge<<",r) p1 and/or p2==0"<<std::endl;
             return 0;
         } 
@@ -155 +155 @@
         if (!edge->_p1 || !edge->_p2)
         {
-            osg::notify(osg::NOTICE)<<"Error updateErrorMetricForEdge("<<edge<<") p1 and/or p2==0"<<std::endl;
+            OSG_NOTICE<<"Error updateErrorMetricForEdge("<<edge<<") p1 and/or p2==0"<<std::endl;
             return;
         }
@@ -227 +227 @@
             if (edge->getErrorMetric()==FLT_MAX)
             {
-                osg::notify(osg::INFO)<<"collapseMinimumErrorEdge() return false due to edge->getErrorMetric()==FLT_MAX"<<std::endl;
+                OSG_INFO<<"collapseMinimumErrorEdge() return false due to edge->getErrorMetric()==FLT_MAX"<<std::endl;
                 return false;
             }
@@ -234 +234 @@
             return (collapseEdge(edge,pNew.get()));
         }
-        osg::notify(osg::INFO)<<"collapseMinimumErrorEdge() return false due to _edgeSet.empty()"<<std::endl;
+        OSG_INFO<<"collapseMinimumErrorEdge() return false due to _edgeSet.empty()"<<std::endl;
         return false;
     }
@@ -247 +247 @@
             if (edge->getErrorMetric()==FLT_MAX)
             {
-                osg::notify(osg::INFO)<<"divideLongestEdge() return false due to edge->getErrorMetric()==FLT_MAX"<<std::endl;
+                OSG_INFO<<"divideLongestEdge() return false due to edge->getErrorMetric()==FLT_MAX"<<std::endl;
                 return false;
             }
@@ -254 +254 @@
             return (divideEdge(edge,pNew.get()));
         }
-        osg::notify(osg::INFO)<<"divideLongestEdge() return false due to _edgeSet.empty()"<<std::endl;
+        OSG_INFO<<"divideLongestEdge() return false due to _edgeSet.empty()"<<std::endl;
         return false;
     }
@@ -369 +369 @@
         {
             _triangles.insert(triangle);
-            // if (_triangles.size()>2) osg::notify(osg::NOTICE)<<"Warning too many triangles ("<<_triangles.size()<<") sharing edge "<<std::endl;
+            // if (_triangles.size()>2) OSG_NOTICE<<"Warning too many triangles ("<<_triangles.size()<<") sharing edge "<<std::endl;
         }
         
@@ -385 +385 @@
         void updateMaxNormalDeviationOnEdgeCollapse()
         {
-            //osg::notify(osg::NOTICE)<<"updateMaxNormalDeviationOnEdgeCollapse()"<<std::endl;
+            //OSG_NOTICE<<"updateMaxNormalDeviationOnEdgeCollapse()"<<std::endl;
             _maximumDeviation = 0.0f;
             for(TriangleSet::iterator itr1=_p1->_triangles.begin();
@@ -520 +520 @@
     Triangle* addTriangle(unsigned int p1, unsigned int p2, unsigned int p3)
     {
-        //osg::notify(osg::NOTICE)<<"addTriangle("<<p1<<","<<p2<<","<<p3<<")"<<std::endl;
+        //OSG_NOTICE<<"addTriangle("<<p1<<","<<p2<<","<<p3<<")"<<std::endl;
 
         // detect if triangle is degenerate.
@@ -554 +554 @@
     Triangle* addTriangle(Point* p1, Point* p2, Point* p3)
     {
-        // osg::notify(osg::NOTICE)<<"      addTriangle("<<p1<<","<<p2<<","<<p3<<")"<<std::endl;
+        // OSG_NOTICE<<"      addTriangle("<<p1<<","<<p2<<","<<p3<<")"<<std::endl;
 
         // detect if triangle is degenerate.
         if (p1==p2 || p2==p3 || p1==p3) 
         {
-            // osg::notify(osg::NOTICE)<<"    **** addTriangle failed - p1==p2 || p2==p3 || p1==p3"<<std::endl;
+            // OSG_NOTICE<<"    **** addTriangle failed - p1==p2 || p2==p3 || p1==p3"<<std::endl;
             return 0;
         }
@@ -631 +631 @@
         if (!(triangle->_p1))
         {
-            osg::notify(osg::NOTICE)<<"testTriangle("<<triangle<<") _p1==NULL"<<std::endl;
+            OSG_NOTICE<<"testTriangle("<<triangle<<") _p1==NULL"<<std::endl;
             ++result;
         }
         else if (triangle->_p1->_triangles.count(triangle)==0) 
         {
-            osg::notify(osg::NOTICE)<<"testTriangle("<<triangle<<") _p1->_triangles does not contain triangle"<<std::endl;
+            OSG_NOTICE<<"testTriangle("<<triangle<<") _p1->_triangles does not contain triangle"<<std::endl;
             ++result;
         }
@@ -642 +642 @@
         if (!(triangle->_p2))
         {
-            osg::notify(osg::NOTICE)<<"testTriangle("<<triangle<<") _p2==NULL"<<std::endl;
+            OSG_NOTICE<<"testTriangle("<<triangle<<") _p2==NULL"<<std::endl;
             ++result;
         }
         else if (triangle->_p2->_triangles.count(triangle)==0) 
         {
-            osg::notify(osg::NOTICE)<<"testTriangle("<<triangle<<") _p2->_triangles does not contain triangle"<<std::endl;
+            OSG_NOTICE<<"testTriangle("<<triangle<<") _p2->_triangles does not contain triangle"<<std::endl;
             ++result;
         }
@@ -653 +653 @@
         if (!(triangle->_p3))
         {
-            osg::notify(osg::NOTICE)<<"testTriangle("<<triangle<<") _p3==NULL"<<std::endl;
+            OSG_NOTICE<<"testTriangle("<<triangle<<") _p3==NULL"<<std::endl;
             ++result;
         }
         else if (triangle->_p3->_triangles.count(triangle)==0) 
         {
-            osg::notify(osg::NOTICE)<<"testTriangle("<<triangle<<") _p3->_triangles does not contain triangle"<<std::endl;
+            OSG_NOTICE<<"testTriangle("<<triangle<<") _p3->_triangles does not contain triangle"<<std::endl;
             ++result;
         }
@@ -665 +665 @@
         {
             ++result;
-            osg::notify(osg::NOTICE)<<"testTriangle("<<triangle<<") _e1 test failed"<<std::endl;
+            OSG_NOTICE<<"testTriangle("<<triangle<<") _e1 test failed"<<std::endl;
         }
         
@@ -671 +671 @@
         {
             ++result;
-            osg::notify(osg::NOTICE)<<"testTriangle("<<triangle<<") _e2 test failed"<<std::endl;
+            OSG_NOTICE<<"testTriangle("<<triangle<<") _e2 test failed"<<std::endl;
         }
 
         if (testEdge(triangle->_e3.get()))
         {
-            osg::notify(osg::NOTICE)<<"testTriangle("<<triangle<<") _e3 test failed"<<std::endl;
+            OSG_NOTICE<<"testTriangle("<<triangle<<") _e3 test failed"<<std::endl;
             ++result;
         }
@@ -697 +697 @@
     Edge* addEdge(Triangle* triangle, Point* p1, Point* p2)
     {
-        // osg::notify(osg::NOTICE)<<"        addEdge("<<p1<<","<<p2<<")"<<std::endl;
+        // OSG_NOTICE<<"        addEdge("<<p1<<","<<p2<<")"<<std::endl;
         osg::ref_ptr<Edge> edge = new Edge;
         if (dereference_check_less(p1, p2))
@@ -715 +715 @@
         if (itr==_edgeSet.end())
         {
-            // osg::notify(osg::NOTICE)<<"          addEdge("<<edge.get()<<") edge->_p1="<<edge->_p1.get()<<" _p2="<<edge->_p2.get()<<std::endl;
+            // OSG_NOTICE<<"          addEdge("<<edge.get()<<") edge->_p1="<<edge->_p1.get()<<" _p2="<<edge->_p2.get()<<std::endl;
             _edgeSet.insert(edge);
         }
         else
         {
-            // osg::notify(osg::NOTICE)<<"          reuseEdge("<<edge.get()<<") edge->_p1="<<edge->_p1.get()<<" _p2="<<edge->_p2.get()<<std::endl;
+            // OSG_NOTICE<<"          reuseEdge("<<edge.get()<<") edge->_p1="<<edge->_p1.get()<<" _p2="<<edge->_p2.get()<<std::endl;
             edge = *itr;
         }
@@ -796 +796 @@
         if (edge->getMaxNormalDeviationOnEdgeCollapse()>1.0)
         {
-            osg::notify(osg::NOTICE)<<"collapseEdge("<<edge<<") refused due to edge->getMaxNormalDeviationOnEdgeCollapse() = "<<edge->getMaxNormalDeviationOnEdgeCollapse()<<std::endl;
+            OSG_NOTICE<<"collapseEdge("<<edge<<") refused due to edge->getMaxNormalDeviationOnEdgeCollapse() = "<<edge->getMaxNormalDeviationOnEdgeCollapse()<<std::endl;
            return false;
         }
         else
         {
-            //osg::notify(osg::NOTICE)<<"collapseEdge("<<edge<<") edge->getMaxNormalDeviationOnEdgeCollapse() = "<<edge->getMaxNormalDeviationOnEdgeCollapse()<<std::endl;
+            //OSG_NOTICE<<"collapseEdge("<<edge<<") edge->getMaxNormalDeviationOnEdgeCollapse() = "<<edge->getMaxNormalDeviationOnEdgeCollapse()<<std::endl;
         }
 #endif
@@ -882 +882 @@
         }
 
-        //osg::notify(osg::NOTICE)<<"  pNew="<<pNew<<"\tedge_p1"<<edge_p1.get()<<"\tedge_p2"<<edge_p2.get()<<std::endl;
+        //OSG_NOTICE<<"  pNew="<<pNew<<"\tedge_p1"<<edge_p1.get()<<"\tedge_p2"<<edge_p2.get()<<std::endl;
         
         // we copy the edge's _triangles and interate the copy of the triangle set to avoid invalidating iterators.
@@ -968 +968 @@
         edges2UpdateErrorMetric.insert(newEdges.begin(), newEdges.end());
 
-        // osg::notify(osg::NOTICE)<<"Edges to recalibarate "<<edges2UpdateErrorMetric.size()<<std::endl;
+        // OSG_NOTICE<<"Edges to recalibarate "<<edges2UpdateErrorMetric.size()<<std::endl;
 
         for(LocalEdgeList::iterator itr=edges2UpdateErrorMetric.begin();
@@ -974 +974 @@
             ++itr)
         {
-            //osg::notify(osg::NOTICE)<<"updateErrorMetricForEdge("<<itr->get()<<")"<<std::endl;
+            //OSG_NOTICE<<"updateErrorMetricForEdge("<<itr->get()<<")"<<std::endl;
             updateErrorMetricForEdge(const_cast<Edge*>(itr->get()));
         }
@@ -984 +984 @@
     bool divideEdge(Edge* edge, Point* pNew)
     {
-         // osg::notify(osg::NOTICE)<<"divideEdge("<<edge<<") before _edgeSet.size()="<<_edgeSet.size()<<" _triangleSet.size()="<<_triangleSet.size()<<std::endl;
+         // OSG_NOTICE<<"divideEdge("<<edge<<") before _edgeSet.size()="<<_edgeSet.size()<<" _triangleSet.size()="<<_triangleSet.size()<<std::endl;
 
         // first collect the triangles associaged with edges that need deleting
@@ -990 +990 @@
         TriangleSet triangles = edge->_triangles;
 
-        // osg::notify(osg::NOTICE)<<"   numTriangles on edges "<<triangles.size()<<std::endl;
+        // OSG_NOTICE<<"   numTriangles on edges "<<triangles.size()<<std::endl;
 
         // unsigned int numTriangles1 = _triangleSet.size();
@@ -1029 +1029 @@
             {
                 case(0): // error, shouldn't get here.
-                    osg::notify(osg::NOTICE)<<"Error EdgeCollapse::divideEdge(Edge*,Point*) passed invalid edge."<<std::endl;
+                    OSG_NOTICE<<"Error EdgeCollapse::divideEdge(Edge*,Point*) passed invalid edge."<<std::endl;
                     return false;
                 case(1): // p1, p2
-                    // osg::notify(osg::NOTICE)<<"   // p1, p2 "<<std::endl;
-                    // osg::notify(osg::NOTICE)<<"   newTri1 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());"<<std::endl;
+                    // OSG_NOTICE<<"   // p1, p2 "<<std::endl;
+                    // OSG_NOTICE<<"   newTri1 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());"<<std::endl;
                     newTri1 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());
-                    // osg::notify(osg::NOTICE)<<"   newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());"<<std::endl;
+                    // OSG_NOTICE<<"   newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());"<<std::endl;
                     newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());
                     break;
                 case(2): // p2, p3
-                    // osg::notify(osg::NOTICE)<<"   // p2, p3"<<std::endl;
-                    // osg::notify(osg::NOTICE)<<"   newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);"<<std::endl;
+                    // OSG_NOTICE<<"   // p2, p3"<<std::endl;
+                    // OSG_NOTICE<<"   newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);"<<std::endl;
                     newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);
-                    //osg::notify(osg::NOTICE)<<"   newTri2 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());"<<std::endl;
+                    //OSG_NOTICE<<"   newTri2 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());"<<std::endl;
                     newTri2 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());
                     break;
                 case(3): // p3, p1
-                    // osg::notify(osg::NOTICE)<<"   // p3, p1"<<std::endl;
-                    // osg::notify(osg::NOTICE)<<"   newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);"<<std::endl;
+                    // OSG_NOTICE<<"   // p3, p1"<<std::endl;
+                    // OSG_NOTICE<<"   newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);"<<std::endl;
                     newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);
-                    // osg::notify(osg::NOTICE)<<"   newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());"<<std::endl;
+                    // OSG_NOTICE<<"   newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());"<<std::endl;
                     newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());
                     break;
@@ -1084 +1084 @@
             ++itr)
         {
-            //osg::notify(osg::NOTICE)<<"updateErrorMetricForEdge("<<itr->get()<<")"<<std::endl;
+            //OSG_NOTICE<<"updateErrorMetricForEdge("<<itr->get()<<")"<<std::endl;
             if (itr->valid()) updateErrorMetricForEdge(const_cast<Edge*>(itr->get()));
         }
@@ -1092 +1092 @@
         // unsigned int numTriangles3 = _triangleSet.size();
 
-        // osg::notify(osg::NOTICE)<<"   numTriangles1="<<numTriangles1<<"   numTriangles2="<<numTriangles2<<"   numTriangles3="<<numTriangles3<<std::endl;
-        // osg::notify(osg::NOTICE)<<"   numEdges1="<<numEdges1<<"   numEdges2="<<numEdges2<<"   numEdges3="<<numEdges3<<std::endl;
-        // osg::notify(osg::NOTICE)<<"   numBoundaryEdges1="<<numBoundaryEdges1<<"   numBoundaryEdges2="<<numBoundaryEdges2<<"   numBoundaryEdges3="<<numBoundaryEdges3<<std::endl;
-        // osg::notify(osg::NOTICE)<<"divideEdge("<<edge<<") after _edgeSet.size()="<<_edgeSet.size()<<" _triangleSet.size()="<<_triangleSet.size()<<std::endl;
+        // OSG_NOTICE<<"   numTriangles1="<<numTriangles1<<"   numTriangles2="<<numTriangles2<<"   numTriangles3="<<numTriangles3<<std::endl;
+        // OSG_NOTICE<<"   numEdges1="<<numEdges1<<"   numEdges2="<<numEdges2<<"   numEdges3="<<numEdges3<<std::endl;
+        // OSG_NOTICE<<"   numBoundaryEdges1="<<numBoundaryEdges1<<"   numBoundaryEdges2="<<numBoundaryEdges2<<"   numBoundaryEdges3="<<numBoundaryEdges3<<std::endl;
+        // OSG_NOTICE<<"divideEdge("<<edge<<") after _edgeSet.size()="<<_edgeSet.size()<<" _triangleSet.size()="<<_triangleSet.size()<<std::endl;
 
         return true;
@@ -1110 +1110 @@
             if (!(triangle->_e1 == edge || triangle->_e2 == edge || triangle->_e3 == edge))
             {
-                osg::notify(osg::NOTICE)<<"testEdge("<<edge<<"). triangle != point back to this edge"<<std::endl;
-                osg::notify(osg::NOTICE)<<"                     triangle->_e1=="<<triangle->_e1.get()<<std::endl;
-                osg::notify(osg::NOTICE)<<"                     triangle->_e2=="<<triangle->_e2.get()<<std::endl;
-                osg::notify(osg::NOTICE)<<"                     triangle->_e3=="<<triangle->_e3.get()<<std::endl;
+                OSG_NOTICE<<"testEdge("<<edge<<"). triangle != point back to this edge"<<std::endl;
+                OSG_NOTICE<<"                     triangle->_e1=="<<triangle->_e1.get()<<std::endl;
+                OSG_NOTICE<<"                     triangle->_e2=="<<triangle->_e2.get()<<std::endl;
+                OSG_NOTICE<<"                     triangle->_e3=="<<triangle->_e3.get()<<std::endl;
                 ++numErrors;
             }
@@ -1120 +1120 @@
         if (edge->_triangles.empty())
         {
-            osg::notify(osg::NOTICE)<<"testEdge("<<edge<<")._triangles is empty"<<std::endl;
+            OSG_NOTICE<<"testEdge("<<edge<<")._triangles is empty"<<std::endl;
             ++numErrors;
         }
@@ -1162 +1162 @@
         if (itr==_pointSet.end())
         {
-            //osg::notify(osg::NOTICE)<<"  addPoint("<<point.get()<<")"<<std::endl;
+            //OSG_NOTICE<<"  addPoint("<<point.get()<<")"<<std::endl;
             _pointSet.insert(point);
         }
@@ -1168 +1168 @@
         {
             point = const_cast<Point*>(itr->get());
-            //osg::notify(osg::NOTICE)<<"  reusePoint("<<point.get()<<")"<<std::endl;
+            //OSG_NOTICE<<"  reusePoint("<<point.get()<<")"<<std::endl;
         }
 
@@ -1203 +1203 @@
             if (!(triangle->_p1 == point || triangle->_p2 == point || triangle->_p3 == point))
             {
-                osg::notify(osg::NOTICE)<<"testPoint("<<point<<") error, triangle "<<triangle<<" does not point back to this point"<<std::endl;
-                osg::notify(osg::NOTICE)<<"             triangle->_p1 "<<triangle->_p1.get()<<std::endl;
-                osg::notify(osg::NOTICE)<<"             triangle->_p2 "<<triangle->_p2.get()<<std::endl;
-                osg::notify(osg::NOTICE)<<"             triangle->_p3 "<<triangle->_p3.get()<<std::endl;
+                OSG_NOTICE<<"testPoint("<<point<<") error, triangle "<<triangle<<" does not point back to this point"<<std::endl;
+                OSG_NOTICE<<"             triangle->_p1 "<<triangle->_p1.get()<<std::endl;
+                OSG_NOTICE<<"             triangle->_p2 "<<triangle->_p2.get()<<std::endl;
+                OSG_NOTICE<<"             triangle->_p3 "<<triangle->_p3.get()<<std::endl;
                 ++numErrors;
             }
@@ -1423 +1423 @@
     {
         // removing coord indices
-        osg::notify(osg::INFO)<<"EdgeCollapse::setGeometry(..): Removing attribute indices"<<std::endl;
+        OSG_INFO<<"EdgeCollapse::setGeometry(..): Removing attribute indices"<<std::endl;
         _geometry->copyToAndOptimize(*_geometry);
     }
@@ -1431 +1431 @@
     {
         // removing coord indices
-        osg::notify(osg::INFO)<<"EdgeCollapse::setGeometry(..): Duplicate shared arrays"<<std::endl;
+        OSG_INFO<<"EdgeCollapse::setGeometry(..): Duplicate shared arrays"<<std::endl;
         _geometry->duplicateSharedArrays();
     }
@@ -1750 +1750 @@
 void Simplifier::simplify(osg::Geometry& geometry, const IndexList& protectedPoints)
 {
-    osg::notify(osg::INFO)<<"++++++++++++++simplifier************"<<std::endl;
+    OSG_INFO<<"++++++++++++++simplifier************"<<std::endl;
 
     EdgeCollapse ec;
@@ -1765 +1765 @@
                ec.collapseMinimumErrorEdge())
         {
-           //osg::notify(osg::INFO)<<"   Collapsed edge ec._triangleSet.size()="<<ec._triangleSet.size()<<" error="<<(*ec._edgeSet.begin())->getErrorMetric()<<" vs "<<getMaximumError()<<std::endl;
-        }
-
-        osg::notify(osg::INFO)<<"******* AFTER EDGE COLLAPSE *********"<<ec._triangleSet.size()<<std::endl;
+           //OSG_INFO<<"   Collapsed edge ec._triangleSet.size()="<<ec._triangleSet.size()<<" error="<<(*ec._edgeSet.begin())->getErrorMetric()<<" vs "<<getMaximumError()<<std::endl;
+        }
+
+        OSG_INFO<<"******* AFTER EDGE COLLAPSE *********"<<ec._triangleSet.size()<<std::endl;
     }
     else
@@ -1779 +1779 @@
                ec.divideLongestEdge())
         {
-           //osg::notify(osg::INFO)<<"   Edge divided ec._triangleSet.size()="<<ec._triangleSet.size()<<" error="<<(*ec._edgeSet.rbegin())->getErrorMetric()<<" vs "<<getMaximumError()<<std::endl;
-        }
-        osg::notify(osg::INFO)<<"******* AFTER EDGE DIVIDE *********"<<ec._triangleSet.size()<<std::endl;
-    }
-
-    osg::notify(osg::INFO)<<"Number of triangle errors after edge collapse= "<<ec.testAllTriangles()<<std::endl;
-    osg::notify(osg::INFO)<<"Number of edge errors before edge collapse= "<<ec.testAllEdges()<<std::endl;
-    osg::notify(osg::INFO)<<"Number of point errors after edge collapse= "<<ec.testAllPoints()<<std::endl;
-    osg::notify(osg::INFO)<<"Number of triangles= "<<ec._triangleSet.size()<<std::endl;
-    osg::notify(osg::INFO)<<"Number of points= "<<ec._pointSet.size()<<std::endl;
-    osg::notify(osg::INFO)<<"Number of edges= "<<ec._edgeSet.size()<<std::endl;
-    osg::notify(osg::INFO)<<"Number of boundary edges= "<<ec.computeNumBoundaryEdges()<<std::endl;
+           //OSG_INFO<<"   Edge divided ec._triangleSet.size()="<<ec._triangleSet.size()<<" error="<<(*ec._edgeSet.rbegin())->getErrorMetric()<<" vs "<<getMaximumError()<<std::endl;
+        }
+        OSG_INFO<<"******* AFTER EDGE DIVIDE *********"<<ec._triangleSet.size()<<std::endl;
+    }
+
+    OSG_INFO<<"Number of triangle errors after edge collapse= "<<ec.testAllTriangles()<<std::endl;
+    OSG_INFO<<"Number of edge errors before edge collapse= "<<ec.testAllEdges()<<std::endl;
+    OSG_INFO<<"Number of point errors after edge collapse= "<<ec.testAllPoints()<<std::endl;
+    OSG_INFO<<"Number of triangles= "<<ec._triangleSet.size()<<std::endl;
+    OSG_INFO<<"Number of points= "<<ec._pointSet.size()<<std::endl;
+    OSG_INFO<<"Number of edges= "<<ec._edgeSet.size()<<std::endl;
+    OSG_INFO<<"Number of boundary edges= "<<ec.computeNumBoundaryEdges()<<std::endl;
 
     if (!ec._edgeSet.empty())
     {
-        osg::notify(osg::INFO)<<std::endl<<"Simplifier, in = "<<numOriginalPrimitives<<"\tout = "<<ec._triangleSet.size()<<"\terror="<<(*ec._edgeSet.begin())->getErrorMetric()<<"\tvs "<<getMaximumError()<<std::endl<<std::endl;
-        osg::notify(osg::INFO)<<           "        !ec._edgeSet.empty()  = "<<!ec._edgeSet.empty()<<std::endl;
-        osg::notify(osg::INFO)<<           "        continueSimplification(,,)  = "<<continueSimplification((*ec._edgeSet.begin())->getErrorMetric() , numOriginalPrimitives, ec._triangleSet.size())<<std::endl;
+        OSG_INFO<<std::endl<<"Simplifier, in = "<<numOriginalPrimitives<<"\tout = "<<ec._triangleSet.size()<<"\terror="<<(*ec._edgeSet.begin())->getErrorMetric()<<"\tvs "<<getMaximumError()<<std::endl<<std::endl;
+        OSG_INFO<<           "        !ec._edgeSet.empty()  = "<<!ec._edgeSet.empty()<<std::endl;
+        OSG_INFO<<           "        continueSimplification(,,)  = "<<continueSimplification((*ec._edgeSet.begin())->getErrorMetric() , numOriginalPrimitives, ec._triangleSet.size())<<std::endl;
     }