Changeset 826 for soft/giet_vm/applications/rosenfeld/nrc2/include/nrsort2.h

Timestamp:

Jul 13, 2017, 11:01:58 AM (7 years ago)

Author:

meunier

Message:

• Mise à jour NR2 et Rosenfeld

File:

• soft/giet_vm/applications/rosenfeld/nrc2/include/nrsort2.h (modified) (4 diffs)

soft/giet_vm/applications/rosenfeld/nrc2/include/nrsort2.h

@@ -11 +11 @@
 #define _NRSORT2_H_
 
-#ifdef __cplusplus
-#ifdef PRAGMA_VERBOSE
-#pragma message ("C++")
-#endif
-extern "C" {
-#endif
+#define extractnz_boundaries_type_matrix(t) \
+void short_name(t,extractnz_boundaries_,matrix)(t ** m, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t * nclnz, int32_t * nchnz);
 
-#ifdef PRAGMA_VERBOSE
-//#pragma message("- include nrsort2.h")
-#endif
+extractnz_boundaries_type_matrix(int8_t);
+extractnz_boundaries_type_matrix(uint8_t);
+extractnz_boundaries_type_matrix(int16_t);
+extractnz_boundaries_type_matrix(uint16_t);
+extractnz_boundaries_type_matrix(int32_t);
+extractnz_boundaries_type_matrix(uint32_t);
+extractnz_boundaries_type_matrix(int64_t);
+extractnz_boundaries_type_matrix(uint64_t);
+extractnz_boundaries_type_matrix(float);
+extractnz_boundaries_type_matrix(double);
 
-IMAGE_EXPORT(void) sort_dmatrix_selection (double *m, long nl, long nh);
 
-IMAGE_EXPORT(void) sort_imatrix_selection2(int **m, long nl, long nh);
-IMAGE_EXPORT(void) sort_imatrix_selection (int **m, long nrl, long nrh, long ncl, long nch, long nrow);
+void sort_si32matrix_selection2(int32_t ** m, int32_t nl, int32_t nh);
+void sort_f64matrix_selection(double * m, int32_t nl, int32_t nh);
+void sort_si32matrix_selection(int32_t ** m, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t nrow);
+void sort_si32matrix_leftpart_selection2(int32_t ** m, int32_t nl, int32_t nh, int32_t len);
 
-IMAGE_EXPORT(void) sort_imatrix_leftpart_selection2(int **m, long nl, long nh, long len);
 /*
  * Sort the first len item of a 2-row matrix
  */
 
-IMAGE_EXPORT(void) sort_index_imatrix_selection_kmin(int   **key, long nrl,long nrh,long ncl, long nch, int **index, int k);
-IMAGE_EXPORT(void) sort_index_imatrix_selection_kmax(int   **key, long nrl,long nrh,long ncl, long nch, int **index, int k);
+void sort_index_si32matrix_selection_kmin(int32_t ** key, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t ** index, int32_t k);
+void sort_index_si32matrix_selection_kmax(int32_t ** key, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t ** index, int32_t k);
+
 /*
  * appel de "sort_index_ivector_selection_k" pour chaque ligne
@@ -39 +43 @@
  */
 
-IMAGE_EXPORT(void) sortv_imatrix_selection_min(int **m, long nrl,long nrh,long ncl, long nch, long nc);
-IMAGE_EXPORT(void) sortv_imatrix_selection_max(int **m, long nrl,long nrh,long ncl, long nch, long nc);
-
-IMAGE_EXPORT(void) sortv_imatrix_selection_kmin(int **m, long nrl,long nrh,long ncl, long nch, long nc, int k);
-IMAGE_EXPORT(void) sortv_imatrix_selection_kmax(int **m, long nrl,long nrh,long ncl, long nch, long nc, int k);
+void sortv_si32matrix_selection_min(int32_t ** m, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t nc);
+void sortv_si32matrix_selection_max(int32_t ** m, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t nc);
+void sortv_si32matrix_selection_kmin(int32_t ** m, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t nc, int32_t k);
+void sortv_si32matrix_selection_kmax(int32_t ** m, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t nc, int32_t k);
 
 /*
@@ -49 +52 @@
  * tri vertical, d'une partie des lignes
  */
-IMAGE_EXPORT(void) sortv_index_imatrix_selection_max(int **key, long nrl,long nrh,long ncl, long nch, int *index, int nc);
-IMAGE_EXPORT(void) sortv_index_imatrix_selection_min(int **key, long nrl,long nrh,long ncl, long nch, int *index, int nc);
+
+void sortv_index_imatrix_selection_max(int ** key, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t * index, int32_t nc);
+void sortv_index_imatrix_selection_min(int32_t ** key, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t * index, int32_t nc);
+
 /*
  * trie de la colonne nc de la matrice key, nc[ncl..nch]
@@ -56 +61 @@
  */
 
-#ifdef __cplusplus
-}
-#endif
+#endif /* _NRSORT2_H_ */
 
-#endif /* _NRSORT2_H_ */
+// Local Variables:
+// tab-width: 4
+// c-basic-offset: 4
+// c-file-offsets:((innamespace . 0)(inline-open . 0))
+// indent-tabs-mode: nil
+// End:
+
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
+