Changeset 7d3cadb in tol

Timestamp:

Oct 5, 2010, 1:48:10 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

72625c3

Parents:

1ecde20

Message:

Recordatorio de la neceisdad de implementar Histogram_cRs para mayor eficiencia

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2568 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/vmatrix_type/vmat_stats.cpp (modified) (3 diffs)

tol/btol/vmatrix_type/vmat_stats.cpp

@@ -794 +794 @@
   int c = M.s_.blasRdense_->ncol;
   BlasRDense(parts, c+1);
-  BArray<double> sorted(r);
   double* h = (double*)s_.blasRdense_->x; 
   double step = (max-min)/double(parts);
@@ -818 +817 @@
 };
 
+/* * /
+////////////////////////////////////////////////////////////////////////////////
+  void BVMat::Histogram_cRs(const BVMat& M, int parts, double min, double max)
+////////////////////////////////////////////////////////////////////////////////
+{
+  int i,j,p;
+  int r = M.s_.cholmodRsparse_->nrow;
+  int c = M.s_.cholmodRsparse_->ncol;
+  int n = r*c;
+  BlasRDense(parts, c+1);
+  double* h = (double*)s_.blasRdense_->x; 
+  double step = (max-min)/double(parts);
+  for(p=0; p<parts-1; p++)
+  {
+    *(h++) = min+step*(p+1);
+  }
+  *(h++) = max;
+  memset(h,0,sizeof(double)*parts*c);
+  const double* x = (const double*)M.s_.blasRdense_->x; 
+//double* y = (double*)s_.blasRdense_->x+parts; 
+  for(j=0; j<c; j++)
+  {
+    double* h0 = ((double*)s_.blasRdense_->x)+parts*(j+1);
+    for(i=0; i<r; i++, x++)
+    {
+      p = (int)((*x-min)/step)-1;
+      if(p<0) { p=0; }
+      if(p>=parts) { p=parts-1; }
+      h0[p] += 1.0/r;
+    }
+  }
+};
+/* */
 ////////////////////////////////////////////////////////////////////////////////
   void BVMat::Histogram_bRd(const BVMat& M, int parts)
@@ -835 +867 @@
 };
 
+
 ////////////////////////////////////////////////////////////////////////////////
   void BVMat::Histogram(const BVMat& M_, int parts, double min, double max)