Anonymous avatar Anonymous committed debc86a

mzd_print_matrix -> mzd_print; mzd_mul_m4rm_t removed

Comments (0)

Files changed (5)

src/brilliantrussian.c

   return answer;
 }
 
-packedmatrix *mzd_mul_m4rm_t(packedmatrix *C, packedmatrix *A, packedmatrix *B, int k) {
-  packedmatrix *AT, *BT, *CT;
-  
-  if(A->ncols != B->nrows) 
-    m4ri_die("mzd_mul_m4rm_t: A ncols (%d) need to match B nrows (%d).\n", A->ncols, B->nrows);
-  
-  AT = mzd_transpose(NULL, A);
-  BT = mzd_transpose(NULL, B);
-  
-  CT = mzd_init(B->ncols, A->nrows);
-  CT = _mzd_mul_m4rm(CT, BT, AT, k, 0);
-  
-  mzd_free(AT);
-  mzd_free(BT);
-
-  C = mzd_transpose(C, CT);
-  mzd_free(CT);
-  return C;
-}
-
 packedmatrix *mzd_mul_m4rm(packedmatrix *C, packedmatrix *A, packedmatrix *B, int k) {
   size_t a = A->nrows;
   size_t c = B->ncols;

src/brilliantrussian.h

 packedmatrix *_mzd_mul_m4rm(packedmatrix *C, packedmatrix *A, packedmatrix *B, int k, int clear);
 
 /**
- * \brief Matrix multiplication using Konrod's method but transpose
- * all matrices first, i.e. compute C = AB = (B^T A^T)^T.
- *
- * \param C Preallocated product matrix, may be NULL for automatic creation.
- * \param A Input matrix A
- * \param B Input matrix B
- * \param k M4RI parameter, may be 0 for auto-choose.
- *
- * \wordoffset
- */
-
-packedmatrix *mzd_mul_m4rm_t(packedmatrix *C, packedmatrix *A, packedmatrix *B, int k);
-
-
-/**
  * \brief If defined 8 Gray code tables are used in parallel.
  */
 

src/packedmatrix.c

 #endif
 }
 
-void mzd_print_matrix( const packedmatrix *M ) {
+void mzd_print( const packedmatrix *M ) {
   size_t i, j;
   char temp[SAFECHAR];
   word *row;
   }
 }
 
-void mzd_print_matrix_tight( const packedmatrix *M ) {
+void mzd_print_tight( const packedmatrix *M ) {
   assert(M->offset == 0);
 
   size_t i, j;

src/packedmatrix.h

     CLR_BIT(M->values[ M->rowswap[row] + (col+M->offset)/RADIX ], (col+M->offset) % RADIX);
 }
 
-
-/**
- * \brief Swap the two rows rowa and rowb starting at the offset.
- * 
- * \param M Matrix
- * \param rowa Row index.
- * \param rowb Row index.
- * \param offset column offset.
- */
- 
-static inline void mzd_row_swap_offset(packedmatrix *M, const size_t rowa, const size_t rowb, const size_t offset) {
-  size_t i;
-  /**
-   * \todo this is pathetic/test code 
-   **/
-  for(i=offset; i<M->ncols; i++) {
-    const BIT temp = mzd_read_bit(M, rowa, i);
-    mzd_write_bit(M, rowa, i, mzd_read_bit(M, rowb, i));
-    mzd_write_bit(M, rowb, i, temp);
-  }
-}
-
 /**
  * \brief Print a matrix to stdout. 
  *
  * \param M Matrix
  */
 
-void mzd_print_matrix(const packedmatrix *M );
+void mzd_print(const packedmatrix *M );
 
 /**
  * \brief Print the matrix to stdout.
  * \param M Matrix
  */
 
-void mzd_print_matrix_tight(const packedmatrix *M );
+void mzd_print_tight(const packedmatrix *M );
 
 /**
  * \brief Add the rows sourcerow and destrow and stores the total in the row
 /*     if( !mzd_is_zero(Y2) ) { */
 /*       printf("inconsistent system of size %llu x %llu\n", Y2->nrows, Y2->ncols); */
 /*       printf("Y2="); */
-/*       mzd_print_matrix(Y2); */
+/*       mzd_print(Y2); */
 /*     } */
     mzd_free_window(H);
     mzd_free_window(Y2);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.