[Teem-commit] SF.net SVN: teem:[4218] teem/trunk/src/pull

[<kin...@us...>]

Revision: 4218
          http://teem.svn.sourceforge.net/teem/?rev=4218&view=rev
Author:   kindlmann
Date:     2009-04-02 19:58:50 +0000 (Thu, 02 Apr 2009)

Log Message:
-----------
last push hacking

Modified Paths:
--------------
    teem/trunk/src/pull/actionPull.c
    teem/trunk/src/pull/contextPull.c
    teem/trunk/src/pull/pull.h

Modified: teem/trunk/src/pull/actionPull.c
===================================================================
--- teem/trunk/src/pull/actionPull.c	2009-04-01 02:01:03 UTC (rev 4217)
+++ teem/trunk/src/pull/actionPull.c	2009-04-02 19:58:50 UTC (rev 4218)
@@ -802,7 +802,7 @@
       }
       /* you have a problem if you had a non-trivial force, but you can't
          ever seem to take a small enough step to reduce energy */
-      if (point->stepEnergy < 0.000000000000001) {
+      if (point->stepEnergy < 0.00000000000000001) {
         if (task->pctx->verbose > 1) {
           printf("%s: %u STUCK (%u); (%g,%g,%g,%g) stepEnr %g\n", me,
                  point->idtag, point->stuckIterNum,

Modified: teem/trunk/src/pull/contextPull.c
===================================================================
--- teem/trunk/src/pull/contextPull.c	2009-04-01 02:01:03 UTC (rev 4217)
+++ teem/trunk/src/pull/contextPull.c	2009-04-02 19:58:50 UTC (rev 4218)
@@ -609,6 +609,7 @@
   case pullPropEnergy:
   case pullPropStepEnergy:
   case pullPropStepConstr:
+  case pullPropScale:
     dim = 1;
     size[0] = pointNum;
     typeOut = nrrdTypeDouble;
@@ -686,6 +687,9 @@
       case pullPropNeighDistMean:
         out_d[outIdx] = point->neighDistMean;
         break;
+      case pullPropScale:
+        out_d[outIdx] = point->pos[3];
+        break;
       }
       ++outIdx;
     } /* for (pointIdx) */

Modified: teem/trunk/src/pull/pull.h
===================================================================
--- teem/trunk/src/pull/pull.h	2009-04-01 02:01:03 UTC (rev 4217)
+++ teem/trunk/src/pull/pull.h	2009-04-02 19:58:50 UTC (rev 4218)
@@ -49,7 +49,7 @@
 #define PULL_THREAD_MAXNUM 512
 #define PULL_VOLUME_MAXNUM 4
 #define PULL_POINT_NEIGH_INCR 16
-#define PULL_BIN_MAXNUM 128*128*128 /* sanity check on max number bins */
+#define PULL_BIN_MAXNUM 128*128*128*30 /* sanity check on max number bins */
 #define POINT_NUM_INCR 1024
 
 #define PULL_PHIST 0
@@ -122,6 +122,7 @@
   pullPropPosition,           /*  7: [4] position */
   pullPropForce,              /*  8: [4] force accumulation */
   pullPropNeighDistMean,      /*  9: [1] "mean distance" to neighbors */
+  pullPropScale,              /* 10: [1] scale position */
   pullPropLast
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.