Text archives Help

---

Author: abhinav
Date: Mon Feb 13 00:24:36 2006
New Revision: 936

Modified:
   trunk/fox/afr_demo/Engine/ImageTraversers/AFR/kdtree.cc
   trunk/fox/afr_demo/Engine/ImageTraversers/STAFRImageTraverser.cc
Log:
disabled adaptivity in STAFR for testing purposes.




Modified: trunk/fox/afr_demo/Engine/ImageTraversers/AFR/kdtree.cc
==============================================================================
--- trunk/fox/afr_demo/Engine/ImageTraversers/AFR/kdtree.cc     (original)
+++ trunk/fox/afr_demo/Engine/ImageTraversers/AFR/kdtree.cc     Mon Feb 13 
00:24:36 2006
@@ -1398,7 +1398,8 @@
     }
     if(!doingMasterTask)
     {
-      int tindex = getTileforXYSafely(newsampleset->oldviewX, 
newsampleset->oldviewY);
+      //int tindex = getTileforXYSafely(newsampleset->oldviewX, 
newsampleset->oldviewY);
+      int tindex = getTilefor(newsampleset->oldviewX, 
newsampleset->oldviewY);
       if(tindex==-1) return 0;
       newsampleset->tileindex = tindex;
       if(!treenode[newsampleset->tileindex].beingUpdated
@@ -1425,7 +1426,8 @@
   
   if(doingMasterTask) return 0;
   // add to the valid tile containing the sampleset
-  int tindex = getTileforXYSafely(newsampleset->viewX, newsampleset->viewY);
+  //int tindex = getTileforXYSafely(newsampleset->viewX, 
newsampleset->viewY);
+  int tindex = getTileforXY(newsampleset->viewX, newsampleset->viewY);
   if(tindex==-1) return 0;
   newsampleset->tileindex = tindex;
   if (treenode[newsampleset->tileindex].type != VALID_TILE)
@@ -1477,9 +1479,11 @@
     }
     if(!doingMasterTask)
     {
-      int tindex = getTileforXYSafely(newsampleset->oldviewX, 
newsampleset->oldviewY);
+      //int tindex = getTileforXYSafely(newsampleset->oldviewX, 
newsampleset->oldviewY);
+      int tindex = getTilefor(newsampleset->oldviewX, 
newsampleset->oldviewY);
       if(tindex==-1) return 0;
-      newsampleset->tileindex = getTileforXYSafely(newsampleset->oldviewX, 
newsampleset->oldviewY);
+      //newsampleset->tileindex = getTileforXYSafely(newsampleset->oldviewX, 
newsampleset->oldviewY);
+      newsampleset->tileindex = getTileforXY(newsampleset->oldviewX, 
newsampleset->oldviewY);
       if(!treenode[newsampleset->tileindex].beingUpdated
           && treenode[newsampleset->tileindex].trylock())
       {
@@ -1504,7 +1508,8 @@
   
   if(doingMasterTask) return 0;
   // add to the valid tile containing the sampleset
-  int tindex = getTileforXYSafely(newsampleset->viewX, newsampleset->viewY);
+  //int tindex = getTileforXYSafely(newsampleset->viewX, 
newsampleset->viewY);
+  int tindex = getTileforXY(newsampleset->viewX, newsampleset->viewY);
   if(tindex==-1) return 0;
   newsampleset->tileindex = tindex;
   if (treenode[newsampleset->tileindex].type != VALID_TILE)

Modified: trunk/fox/afr_demo/Engine/ImageTraversers/STAFRImageTraverser.cc
==============================================================================
--- trunk/fox/afr_demo/Engine/ImageTraversers/STAFRImageTraverser.cc    
(original)
+++ trunk/fox/afr_demo/Engine/ImageTraversers/STAFRImageTraverser.cc    Mon 
Feb 13 00:24:36 2006
@@ -614,7 +614,7 @@
     if(initpass[masterID]) {
       // adjust tiles based on current status
       Real afr_begin = afr_context->beginAdjustTiles();
-      adjustTiles(afr_context, masterID, currenttime);
+      //adjustTiles(afr_context, masterID, currenttime);
       afr_context->endAdjustTiles( afr_begin );
       //cout << "updateCount says: " << updatecount[masterID] << endl;
     }

---

• [MANTA] r936 - in trunk/fox/afr_demo/Engine/ImageTraversers: . AFR, abhinav, 02/13/2006

---

Archive powered by MHonArc 2.6.16.