Changeset 4420071 in tol

Timestamp:

Nov 9, 2009, 6:10:04 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d2965a2

Parents:

4dabb45

Message:

Fixes #779

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

Location:

tol

Files:

• bbasic/tol_hash_map.h (modified) (2 diffs)
• btol/matrix_type/matgra.cpp (modified) (1 diff)

tol/bbasic/tol_hash_map.h

@@ -110 +110 @@
 };
 
+struct hash_double
+{
+  size_t operator()(const double& s) const 
+  {
+    size_t aux= *((size_t*)&s);
+    return(aux);
+  }
+};
+
 //--------------------------------------------------------------------
 //this template struct allow define generic typedef of hash_map
@@ -183 +192 @@
     size_t,
     _T
+  >sparse_;
+};
+
+template<class _T>
+struct hash_map_by_double
+{
+  //dense hash_map indexed by double
+  typedef dense_hash_map
+  <
+    double,
+    _T,
+    hash_double,
+    std::equal_to<double>
+  >dense_;
+  //sparse hash_map indexed by double
+  typedef sparse_hash_map
+  <
+    double,
+    _T,
+    hash_double,
+    std::equal_to<double>
   >sparse_;
 };

tol/btol/matrix_type/matgra.cpp

@@ -6713 +6713 @@
       }
     }
+  }  
+}
+
+
+//--------------------------------------------------------------------
+DeclareContensClass(BMat, BMatTemporary, BMatReplace);
+DefExtOpr(1, BMatReplace, "MatReplace", 3, 3, "Matrix Matrix Matrix",
+  "(Matrix data, Matrix old, Matrix new)",
+  I2("Replaces in arbitrary matrix 'data' all occurrences of cell "
+  "given in column matrix 'old' by corresponding cell in column "
+  "matrix 'new', having obviously the same dimensions that 'old'.\n"
+  "CAUTION!: 'old' cannot have repeated cells\n",
+  "Reemplaza en la matriz arbitraria 'data' todas las ocurrencias "
+  "de las celdas de la matriz columna 'old' por la celda "
+  "correspondiente de la matriz columna 'new', que lógicamente "
+  "debe tener las mismas dimensiones que 'old'.\n"
+  "¡CUIDADO!: 'old' no debe tener celdas repetidas\n"),
+  BOperClassify::MatrixAlgebra_);
+//--------------------------------------------------------------------
+void BMatReplace::CalcContens()
+//--------------------------------------------------------------------
+{
+  int k;
+  DMat& A    = dMat(Arg(1));
+  DMat& old_ = dMat(Arg(2));
+  DMat& new_ = dMat(Arg(3));
+  int m = old_.Rows(); 
+  if((new_.Rows()!=m)|(old_.Columns()!=1)|(new_.Columns()!=1))
+  {
+    Error(I2("Arguments 'old' and 'new' must be column matrices with "
+             "the same number of rows.",
+             "Los argumentos 'old' y 'mew' deben ser matrices columna "
+             "con el mismo numero de filas.")+
+             "\n  old:("+old_.Rows()+"x"+old_.Columns()+"); "+
+             "\n  new:("+new_.Rows()+"x"+new_.Columns()+"); ");
+    return;
+  }
+  hash_map_by_double<double>::sparse_ hashMap;
+  hash_map_by_double<double>::sparse_::const_iterator fc;
+  const double* x = old_.Data().Buffer();
+  const double* y = new_.Data().Buffer();
+  for(k=0; k<m; k++, x++, y++)
+  {
+    const double& xk = *x;
+    fc = hashMap.find(xk);
+    if(fc!=hashMap.end()) 
+    { 
+      Error(I2("Argument 'old' cannot have repeated cells.",
+               "El argumento 'old' no puede tener celdas repetidas.")+
+               "\n  old["+(k+1)+"] = "+xk+"; ");
+      return;
+    }
+    hashMap[xk] = *y;
+  }
+  int rows = A.Rows();
+  int cols = A.Columns();
+  contens_.Alloc(rows, cols);
+  const BArray<double>& data = A.Data();
+  int s = data.Size();
+  const double* a = data.Buffer();
+  double* c = (double*)(contens_.GetData().GetBuffer());
+  for(k=0; k<s; k++, a++, c++)
+  {
+    fc = hashMap.find(*a);
+    if(fc!=hashMap.end()) 
+    { 
+      *c = fc->second;
+    }
+    else
+    {
+      *c = *a;
+    }
   }
    
 }
 
+