SCM Repository

[matrix] Diff of /pkg/src/Mutils.h
 [matrix] / pkg / src / Mutils.h

Diff of /pkg/src/Mutils.h

revision 1449, Sat Aug 26 13:00:36 2006 UTC revision 1507, Mon Sep 4 18:41:34 2006 UTC
# Line 85  Line 85
85
86  #define uplo_P(_x_) CHAR(STRING_ELT(GET_SLOT(_x_, Matrix_uploSym), 0))  #define uplo_P(_x_) CHAR(STRING_ELT(GET_SLOT(_x_, Matrix_uploSym), 0))
87  #define diag_P(_x_) CHAR(STRING_ELT(GET_SLOT(_x_, Matrix_diagSym), 0))  #define diag_P(_x_) CHAR(STRING_ELT(GET_SLOT(_x_, Matrix_diagSym), 0))
88    #define class_P(_x_) CHAR(asChar(getAttrib(_x_, R_ClassSymbol)))
89
90  /**  /**
91   * Check for valid length of a packed triangular array and return the   * Check for valid length of a packed triangular array and return the
# Line 179  Line 179
179      return missing;      return missing;
180  }  }
181
SEXP alloc3Darray(SEXPTYPE mode, int nrow, int ncol, int nface);

182  /**  /**
183   * Calculate the zero-based index in a row-wise packed lower triangular matrix.   * Calculate the zero-based index in a row-wise packed lower triangular matrix.
184   * This is used for the arrays of blocked sparse matrices.   * This is used for the arrays of blocked sparse matrices.
# Line 197  Line 195
195      return (k * (k + 1))/2 + i;      return (k * (k + 1))/2 + i;
196  }  }
197
/**
* Check for a complete match on matrix dimensions
*
* @param xd dimensions of first matrix
* @param yd dimensions of second matrix
*
* @return 1 if dimensions match, otherwise 0
*/
static R_INLINE
int match_mat_dims(const int xd[], const int yd[])
{
return xd[0] == yd[0] && xd[1] == yd[1];
}

198  double *expand_csc_column(double *dest, int m, int j,  double *expand_csc_column(double *dest, int m, int j,
199                            const int Ap[], const int Ai[], const double Ax[]);                            const int Ap[], const int Ai[], const double Ax[]);
200
# Line 291  Line 275
275      return dest;      return dest;
276  }  }
277
SEXP alloc_real_classed_matrix(char *class, int nrow, int ncol);
278  SEXP alloc_dgeMatrix(int m, int n, SEXP rownms, SEXP colnms);  SEXP alloc_dgeMatrix(int m, int n, SEXP rownms, SEXP colnms);
279  SEXP alloc_dpoMatrix(int n, char *uplo, SEXP rownms, SEXP colnms);  SEXP alloc_dpoMatrix(int n, char *uplo, SEXP rownms, SEXP colnms);
280  SEXP alloc_dtrMatrix(int n, char *uplo, char *diag, SEXP rownms, SEXP colnms);  SEXP alloc_dtrMatrix(int n, char *uplo, char *diag, SEXP rownms, SEXP colnms);
# Line 299  Line 282
282
283  SEXP dup_mMatrix_as_dgeMatrix(SEXP A);  SEXP dup_mMatrix_as_dgeMatrix(SEXP A);
284
285    static R_INLINE SEXP
286    mMatrix_as_dgeMatrix(SEXP A)
287    {
288        return strcmp(class_P(A), "dgeMatrix") ? dup_mMatrix_as_dgeMatrix(A) : A;
289    }
290
291  /**  /**
292   * Return the 0-based index of a string match in a vector of strings   * Return the 0-based index of a string match in a vector of strings

Legend:
 Removed from v.1449 changed lines Added in v.1507