Changeset 20f76bc in tol

Timestamp:

Aug 13, 2010, 11:08:53 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

aebb9ee

Parents:

15ee97c

Message:

New built-in function Matrix InversePermutation

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

File:

• tol/btol/matrix_type/matgra.cpp (modified) (1 diff)

tol/btol/matrix_type/matgra.cpp

@@ -1713 +1713 @@
   }
   PivotByRows(contens_,pivots);
+}
+
+//--------------------------------------------------------------------
+DeclareContensClass(BMat, BMatTemporary, BMatInversePermutation);
+DefExtOpr(1, BMatInversePermutation, "InversePermutation", 1, 1, "Matrix",
+  "(Matrix p)",
+  I2("Given a column or row of any realignment of integers numbers "
+     "1 ... N returns the inverse permutation. ",
+     "Dada una fila o columna con una reordenación cualquiera de "
+     "los enteros 1 ... N, devuelve la permutación inversa."),
+    BOperClassify::MatrixAlgebra_);
+//--------------------------------------------------------------------
+void BMatInversePermutation::CalcContens()
+//--------------------------------------------------------------------
+{
+  BMat& P  = Mat(Arg(1));
+  int i, k, n = P.Data().Size();
+  int pr = P.Rows();
+  int pc = P.Columns();
+  if((pr!=1) && (pc!=1))
+  { 
+    Error(I2("Cannot apply InversePermutation to non vectorial matriz ",
+               "No se puede aplicar InversePermutation a la matriz no vectorial ")+
+            "p("+pr+"x"+pc+") ");
+    return; 
+  }
+  contens_.Alloc(pr,pc);
+  const double* p = (const double*)P.Data().Buffer();
+  double* c = (double*)contens_.GetData().GetBuffer();
+  for(i=1; i<=n; i++, p++)
+  {
+    k = (int)(*p);
+    c[k-1] = i;
+  //Std(BText("\n[InversePermutation] ")+k+" -> "+i)
+  }
 }