Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp (modified) (3 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp

@@ -39 +39 @@
 
         /*allocate: */
-        already=(bool*)xcalloc(nods,sizeof(bool));
+        already=xNewZeroInit<bool>(nods);
 
         /*partition loop across threads: */
@@ -45 +45 @@
 
         /*Loop over the nodes*/
-        if (my_thread==0) printf("      loop progress:   %5.2lf %%",0.0);
-
         for (i=i0;i<i1;i++){
 
                 /*display current iteration*/
-                if (my_thread==0 && fmod((double)i,(double)100)==0) printf("\b\b\b\b\b\b\b%5.2lf %%",(double)i/nods*100*num_threads);
+                if (my_thread==0 && fmod((double)i,(double)100)==0)
+                 _printString_("\r      loop progress: "<<setw(6)<<setprecision(2)<<double(i-i0)/double(i1-i0)*100<<"%");
 
                 distance=mindistance+100; //make sure initialization respects min distance criterion.
@@ -70 +69 @@
                 }
         }
-        if (my_thread==0) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
+        if (my_thread==0)
+         _printLine_("\r      loop progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 
         /*Free ressources:*/
-        xfree((void**)&already);
+        xDelete<bool>(already);
         
         return NULL;