Changeset 2323 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/saliency.cpp

Timestamp:

04/12/07 09:25:16 (17 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/saliency.cpp (modified) (1 diff)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/saliency.cpp

@@ -58 +58 @@
 
 double VMI::computeTriangleSaliency(Mesh *mesh, int **histogram, int numCameras, int k) {
-    int i, l, v0, v1, v2;
-    int *triangles = NULL, n = 0;
+    int i, j, t, v0;
+    int n = 0;
     double sal = 0.0;
     
-    v0 = mesh->triangles[k].indices[0];
-    v1 = mesh->triangles[k].indices[1];
-    v2 = mesh->triangles[k].indices[2];
-    
-    /* Allocating memory */
-    triangles = (int *)malloc((mesh->vertices[v0].numTriangles +
-                               mesh->vertices[v1].numTriangles +
-                               mesh->vertices[v2].numTriangles) * sizeof(int));
-
-    for(i=0; i<mesh->vertices[v0].numTriangles; i++) {
-        l = mesh->vertices[v0].triangles[i];
+    for (j=0; j<3; j++) {
         
-        if (l != k) 
-            addItem(triangles, &n, l);
-    }
-    
-    for(i=0; i<mesh->vertices[v1].numTriangles; i++) {
-        l = mesh->vertices[v1].triangles[i];
+        v0 = mesh->triangles[k].indices[j];
         
-        if (l != k) 
-            addItem(triangles, &n, l);
-    }
-    
-    for(i=0; i<mesh->vertices[v2].numTriangles; i++) {
-        l = mesh->vertices[v2].triangles[i];
-        
-        if (l != k) 
-            addItem(triangles, &n, l);
-    }
-    
-    //printItemList(triangles, n);
-    
-    for(i=0; i<n; i++) {
-        //printf("\n%d %d", k, triangles[i]);
-        //sal += computeJS(histogram, numCameras, k, triangles[i]);
-                sal = MAX ( sal, computeJS(histogram, numCameras, k, triangles[i]));
+        for(i=0; i<mesh->vertices[v0].numTriangles; i++) {
+            t = mesh->vertices[v0].triangles[i];
+            
+            if (t != k) {
+                //printf("\n%d %d", k, triangles[i]);
+                //sal += computeJS(histogram, numCameras, k, t);
+                sal = MAX(sal, computeJS(histogram, numCameras, k, t));
+                
+                n++;
+            }
+        }
     }
     //printf("\nT%d Sal: %f\n", k, (sal / n));
     //getchar();
     
-    free(triangles);
-
     return (sal /*/ n*/);
 }