Changeset 25

Timestamp:

03/16/12 13:49:06 (13 years ago)

Author:

dtax

Message:

Removed a bug in freeing a tmp variable...

File:

• prextra/decisiontree.c (modified) (5 diffs)

prextra/decisiontree.c

@@ -132 +132 @@
                                 /* printf("fss[%d]=%d\n",i,fss[i]); */
                         }
+                        free(tmp);
                 }
                 else
+                {
                         for (i=0;i<D;i++)
+                        {
                                 fss[i] = i;
-                free(tmp);
+                                /* printf("fss[%d]=%d\n",i,fss[i]); */
+                        }
+                        F = D;
+                }
 
                 /* check each feature separately: */
@@ -155 +161 @@
                         }
                         qsort((void *)tmp,I[0],sizeof(tmp[0]),compare_objs);
-                        /*for (j=0;j<I[0];j++){
-                                printf("   -> tmp[%d] = %f, idx=%d\n",j,tmp[j].val,tmp[j].idx);
-                        }*/
+/* for (j=0;j<I[0];j++) printf("   -> tmp[%d] = %f, idx=%d\n",j,tmp[j].val,tmp[j].idx); */
                         /* make indices for the split */
                         for (j=0;j<I[0];j++)
@@ -199 +203 @@
 
                 }
-/*printf("Finally, we use feature %d on split %d, threshold %f\n",
-                out->feat,bestsplit,out->thres);
-printf("Left objects:\n");
+/* printf("Finally, we use feature %d on split %d, threshold %f\n",
+                out->feat,bestsplit,out->thres); */
+/*printf("Left objects:\n");
 for (k=1;k<=Ileftbest[0];k++)
         printf("   Ileft[%d] = %d\n",k,Ileftbest[k]);
@@ -323 +327 @@
         if (nrhs==4) {
                 /* Get the input and check stuff */
+/* printf("get input and check\n"); */
                 x = mxGetPr(prhs[0]);
                 N = mxGetM(prhs[0]);
@@ -333 +338 @@
                 K = (int)(mxGetPr(prhs[2])[0]);
                 F = (int)(mxGetPr(prhs[3])[0]);
+/* printf("N=%d, D=%d, K=%d, F=%d\n",N,D,K,F); */
                 /* allocate */
                 tmp_p = (double *)malloc(K*sizeof(double)); /* for gini */