Changeset 2127 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/metrics.cpp

Timestamp:

02/19/07 09:16:59 (17 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/metrics.cpp (modified) (14 diffs)

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

@@ -13 +13 @@
 using namespace VMI;
 
-GLdouble VMI::computeMeanProjAreaNoBG(GLuint **histogram, GLuint numCameras, int t) {
-    GLuint i;
+GLdouble VMI::computeMeanProjAreaNoBG(int **histogram, int numCameras, int t) {
+    int i;
     GLdouble mean_proj_area = 0.0;
 
@@ -24 +24 @@
 }
 
-GLdouble VMI::computeMeanProjArea(GLuint **histogram, GLuint numCameras, int t) {
-        GLuint i;
+GLdouble VMI::computeMeanProjArea(int **histogram, int numCameras, int t) {
+        int i;
         GLdouble mean_proj_area = 0.0, total_proj_area, resolution = width * height;
 
@@ -38 +38 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Mutual Information
-GLdouble VMI::computeMI(Mesh *mesh, GLuint **histogram, GLuint numCameras, GLuint cam) {
+GLdouble VMI::computeMI(Mesh *mesh, int **histogram, int numCameras, int cam) {
     GLdouble I = 0.0, pov, po, total_proj_area = width * height;
-    GLuint i;
+    int i;
     
     for (i=0; i<mesh->numTriangles; i++) { 
@@ -66 +66 @@
 }
 
-GLdouble VMI::decMI(GLdouble I, GLuint **histogram, GLuint numCameras, GLuint cam, Change *c) {
+GLdouble VMI::decMI(GLdouble I, int **histogram, int numCameras, int cam, Change *c) {
     GLdouble newI = I * numCameras, 
              pov = 0.0, po;
@@ -109 +109 @@
 }
 
-GLdouble VMI::incMI(GLdouble I, GLuint **histogram, GLuint numCameras, GLuint cam, Change *c) {
+GLdouble VMI::incMI(GLdouble I, int **histogram, int numCameras, int cam, Change *c) {
     GLdouble newI = I * numCameras, 
              pov = 0.0, po;
     GLsizei total_proj_area = width * height;
-    GLuint i, t;
+    int i, t;
 
     // increase entropy of modified triangles
-    for (i=0; i<(GLuint)c->numMod; i++) { 
+    for (i=0; i<c->numMod; i++) { 
         
         t = c->modified[i].id;
@@ -140 +140 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Kullback-Leibler divergence
-GLdouble VMI::computeKL(Mesh *mesh, GLuint *histogram) {
+GLdouble VMI::computeKL(Mesh *mesh, int *histogram) {
     GLdouble I = 0.0, 
              total_real_area = 0.0, pi, tri_area;
     GLsizei  total_proj_area = (width * height) - histogram[0];
-    GLuint   i;
+    int   i;
 
     // Compute total real area of all triangles
@@ -169 +169 @@
 
 // Hellinger divergence (square root)
-GLdouble VMI::computeHE(Mesh *mesh, GLuint *histogram) {
+GLdouble VMI::computeHE(Mesh *mesh, int *histogram) {
     GLdouble I = 0.0, temp, 
              total_real_area = 0.0, pi, qi;
     GLsizei  total_proj_area = (width * height) - histogram[0];
-    GLuint i;
+    int i;
     
     // Compute total real area of all triangles
@@ -203 +203 @@
 
 // Chi-Square divergence (square root)
-GLdouble VMI::computeCS(Mesh *mesh, GLuint *histogram) {
+GLdouble VMI::computeCS(Mesh *mesh, int *histogram) {
     GLdouble I = 0.0, 
              total_real_area = 0.0, pi, qi;
     GLsizei  total_proj_area = (width * height) - histogram[0];
-    GLuint i;
+    int i;
     
     /// Compute total real area of all triangles
@@ -231 +231 @@
 }
 ///////////////////////////////////////////////////////////////////////////////
-GLdouble VMI::computeEntropy(GLuint **histogram, GLuint numCameras, GLuint k) {
+GLdouble VMI::computeEntropy(int **histogram, int numCameras, int k) {
         GLdouble H = 0.0, POk, pi,
                                          total_proj_area, resolution = width * height, pv = 1.0 / (GLdouble)numCameras;
-        GLuint i;
+        int i;
 
         for (i=0; i<numCameras; i++) {
@@ -253 +253 @@
 }
 
-GLdouble VMI::computeMixedEntropy(GLdouble *mixed, GLuint numCameras) {
+GLdouble VMI::computeMixedEntropy(GLdouble *mixed, int numCameras) {
     GLdouble H = 0.0, pi;
-    GLuint i;
+    int i;
     
     for (i=0; i<numCameras; i++) {
@@ -269 +269 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Jensen-Shannon divergence
-GLdouble VMI::computeJS(GLuint **histogram, GLuint numCameras, GLuint j, GLuint k) {
+GLdouble VMI::computeJS(int **histogram, int numCameras, int j, int k) {
         GLdouble js, Wj = 0.0, Wk = 0.0, POj, POk, pj, pk, total_proj_area,
                                          resolution = width * height, pv = 1.0 / (GLdouble)numCameras,
                                          *mixing = (GLdouble *)malloc(numCameras * sizeof(GLdouble));
-        GLuint i;
+        int i;
 
         POj = computeMeanProjArea(histogram, numCameras, j + 1);
@@ -311 +311 @@
 }
 ///////////////////////////////////////////////////////////////////////////////
-void VMI::getProjectedAreas(GLuint **histogram, GLuint numCameras) {
-
-    renderScene(histogram, numCameras);
-}
-
-void VMI::getProjectedAreasWin(GLuint **histogram, GLuint numCameras, Change *c) {
-
-    renderSceneWin(histogram, numCameras, c);
-}
-
-void VMI::resetProjectedAreas(GLuint **histogram, GLuint numCameras) {
-    GLuint i = 0;
-
-    // Reset the projected areas for all cameras
-    for (i=0; i<numCameras; i++)
-        resetSWHistogram(histogram[i], mesh->numTriangles);
-}
-
-GLdouble *VMI::initIs(GLuint numCameras) {
+
+GLdouble *VMI::initIs(int numCameras) {
     GLdouble *initialIs;
 
@@ -346 +329 @@
 }
 
-void VMI::computeCameraIs(GLuint **histogram, GLuint numCameras, GLdouble *mis) {
-    GLuint i = 0;
+void VMI::computeCameraIs(int **histogram, int numCameras, GLdouble *mis) {
+    int i = 0;
     GLdouble meanI = 0.0;
 
@@ -374 +357 @@
 }
 
-void VMI::printIs(GLdouble *mis, GLuint numCameras) {
-    GLuint i;
+void VMI::printIs(GLdouble *mis, int numCameras) {
+    int i;
 
     printf("\n");