Index: mttroot/mtt/cc/include/useful-functions.hh ================================================================== --- mttroot/mtt/cc/include/useful-functions.hh +++ mttroot/mtt/cc/include/useful-functions.hh @@ -10,39 +10,39 @@ #endif // __CPLUSPLUS // == Template functions == -inline class_t +static inline class_t max (const class_t &x1, const class_t &x2) { return ((x1 >= x2) ? x1 : (x1 < x2) ? x2 : 0); } -inline class_t +static inline class_t min (const class_t &x1, const class_t &x2) { return ((x1 <= x2) ? x1 : (x1 > x2) ? x2 : 0); } -inline class_t +static inline class_t sign (const class_t &x) { return ((x > 0) ? +1 : (x < 0) ? -1 : 0); } // == Octave functions == -inline Matrix +static inline Matrix ones (const int r = 1, const int c = 1) { Matrix m (r, c, 1.0); return m; } -inline ColumnVector +static inline ColumnVector nozeros (const ColumnVector v0, const double tol = 0.0) { ColumnVector v (v0.length ()); register int i, j; for (i = j = 0; i < v.length (); i++) @@ -59,20 +59,20 @@ { return (v.extract (0, --j)); } } -inline ColumnVector +static inline ColumnVector zeros (const int r) { ColumnVector v (r, 0.0); return v; } -inline Matrix +static inline Matrix zeros (const int r, const int c) { Matrix m (r, c, 0.0); return m; } #endif // HAVE_USEFUL_FUNCTIONS_HH