These are fully functional files. Now I am about to change the code for component wise bounding

fastlib/u/gmravi/regression/regression_matrix.h

@@ -30,10 +30,15 @@ template <typename TKernel> class NaiveMatrixCalculation{
 
  public:
 
+  //getter....
+  Matrix & get_results(index_t q){
 
-  //getter function....
+    return results_[q];
 
-  ArrayList<Matrix>  &get_results(){
+  }
+
+  //Will invert the B^ T WB matrix for each query point
+  void InvertAll(){
    
 
     /** At the moment the arraylist results_ has the matrix estimate B^TWB. 
@@ -43,7 +48,7 @@ template <typename TKernel> class NaiveMatrixCalculation{
 
     //First invert the results.....   
     for(index_t q=0;q<qset_.n_cols();q++){ //for all query points 
-     
+ 
       /*This is inversion by SVD **********/
       Vector s;
       Matrix U;
@@ -68,7 +73,6 @@ template <typename TKernel> class NaiveMatrixCalculation{
       //appropriately initialize s_diagonal
 
       S_diagonal.Init(rows_in_S_diagonal,cols_in_S_diagonal);
-     
       //Fill up the s_diagonal matrix with the reciprocal elements of s
       
       for(index_t i=0;i<rows_in_S_diagonal;i++){
@@ -78,6 +82,7 @@ template <typename TKernel> class NaiveMatrixCalculation{
 	  if(i==j){
 	    
             //The diagonal element
+	    //printf("s[i] is %f\n",s[i]);
 	    S_diagonal.set(i,j,1.0/s[i]);
 	  }
 	  else{
@@ -86,6 +91,10 @@ template <typename TKernel> class NaiveMatrixCalculation{
 	  }
 	}
       }
+
+      //printf("S_diagonal is \n");
+      S_diagonal.PrintDebug();
+      
       
       //printf("Did inversion of s vector..\n");
       
@@ -97,16 +106,16 @@ template <typename TKernel> class NaiveMatrixCalculation{
       //Find transpose of U
       
       la::TransposeInit(U,&U_transpose);
-      la::MulInit(temp1, U_transpose, &temp2); //At this point the variable temp holds the pseudo-inverse of results_[q]
+      la::MulInit(temp1, U_transpose, &temp2); 
+      //At this point the variable temp holds the 
+      //pseudo-inverse of results_[q]
      
       
       //Copy the contents of temp2 to results_
       results_[q].CopyValues(temp2);
     
     }
-     
-    //Now results_ hold B^TWB for each query point
-    return results_;
+    
   }
 
 
@@ -187,6 +196,8 @@ template <typename TKernel> class NaiveMatrixCalculation{
 	}
       }
     }
+    //Invert the results obtained till now
+    InvertAll();
   }
 
 
@@ -1037,10 +1048,6 @@ template <typename TKernel > class FastMatrixCalculation {
     return results_;
   }
  
-  Vector& get_denominator_nwr(){
-
-    //    return denominator_nwr_;
-  }
   //Interesting functions.......................... 
   void Compute (double tau){
     
@@ -1062,12 +1069,12 @@ template <typename TKernel > class FastMatrixCalculation {
    
     // scale dataset if the user wants to. 
      
-    if (!strcmp (fx_param_str (NULL, "scaling", NULL), "range")){
+    /* if (!strcmp (fx_param_str (NULL, "scaling", NULL), "range")){
        
       scale_data_by_minmax ();
       printf("data was scaled in reg2...");
       
-    }
+      }*/
      
     // initialize the kernel
      

fastlib/u/gmravi/regression/regression_vector.h

@@ -612,6 +612,7 @@ template < typename TKernel > class FastVectorCalculation{
     new_mass_l.Init (rset_.n_rows () + 1);
     new_mass_l.SetAll (0);
 
+    //I will prune only if I can prune along all the dimensions.
     for (int i = 0; i < rset_.n_rows () + 1; i++){  //Along each dimension
 
       new_mass_l[i] = stat.mass_l[i] + dl[i];
@@ -622,7 +623,7 @@ template < typename TKernel > class FastVectorCalculation{
       // this is error per each query/reference pair for a fixed query
       double m = 0.5 * (kernel_value_range.hi - kernel_value_range.lo);
 
-      // this is total maximumn error for each query point
+      // this is total maximumn error for each query point along a given dimension
       double error = m * rnode->stat ().weight_of_dimension[i];
 
       // check pruning condition
@@ -984,7 +985,7 @@ template < typename TKernel > class FastVectorCalculation{
      
     }
 
-    printf("the weights are ..\n");
+    
     // rset_weights_.PrintDebug();
    
     if (!strcmp (qfname, rfname)){
@@ -1003,20 +1004,13 @@ template < typename TKernel > class FastVectorCalculation{
     if (!strcmp (fx_param_str (NULL, "scaling", NULL), "range")){
 
       scale_data_by_minmax ();
-      printf("scaling over and will exit now..\n");
+      
       
     }
 
     // construct query and reference trees. This also fills up the statistics in the reference tree
 
 
-    printf("the refernece file is ..\n");
-    printf("sixe of ref file is %d\n",rset_.n_cols()*rset_.n_rows());
-
-    printf("the QUery file is ..\n");
-    printf("sixe of query file is %d\n",qset_.n_cols()*qset_.n_rows());
-
-
     
     fx_timer_start (NULL, "tree_first");
     rroot_ = tree::MakeKdTreeMidpoint < Tree > (rset_, leaflen, &old_from_new_r_, &new_from_old_r_);