| Matop.h | Matop.h | |||
|---|---|---|---|---|
| skipping to change at line 32 | skipping to change at line 31 | |||
| extern int findHermiteBasis ( Matrix *M, Matrix **Result ); | extern int findHermiteBasis ( Matrix *M, Matrix **Result ); | |||
| extern Matrix *Identity ( unsigned size ); | extern Matrix *Identity ( unsigned size ); | |||
| extern Bool isinHnf ( Matrix *A ); | extern Bool isinHnf ( Matrix *A ); | |||
| extern Bool isIntegral ( Matrix *A ); | extern Bool isIntegral ( Matrix *A ); | |||
| extern Value *Lcm (Value i, Value j); | extern Value *Lcm (Value i, Value j); | |||
| extern Matrix * Matrix_Copy ( Matrix *Src ); | extern Matrix * Matrix_Copy ( Matrix *Src ); | |||
| extern void PutColumnFirst ( Matrix *X, int Columnnumber ); | extern void PutColumnFirst ( Matrix *X, int Columnnumber ); | |||
| extern void PutColumnLast ( Matrix *X, int Columnnumber ); | extern void PutColumnLast ( Matrix *X, int Columnnumber ); | |||
| extern void PutRowFirst ( Matrix *X, int Rownumber ); | extern void PutRowFirst ( Matrix *X, int Rownumber ); | |||
| extern void PutRowLast ( Matrix *X, int Rownumber ); | extern void PutRowLast ( Matrix *X, int Rownumber ); | |||
| extern Matrix *RemoveNColumns ( Matrix *M, int FirstColumnnumber, int NumCo lumns ); | ||||
| extern Matrix *RemoveColumn ( Matrix *M, int Columnnumber ); | extern Matrix *RemoveColumn ( Matrix *M, int Columnnumber ); | |||
| extern Matrix *RemoveRow ( Matrix *M, int Rownumber ); | extern Matrix *RemoveRow ( Matrix *M, int Rownumber ); | |||
| extern Matrix *Transpose ( Matrix *A ); | extern Matrix *Transpose ( Matrix *A ); | |||
| #if defined(__cplusplus) | #if defined(__cplusplus) | |||
| } | } | |||
| #endif | #endif | |||
| #else /* (defined(__STDC__) || defined(__cplusplus)) */ | #else /* (defined(__STDC__) || defined(__cplusplus)) */ | |||
| skipping to change at line 56 | skipping to change at line 56 | |||
| extern int findHermiteBasis (/* Matrix *M, Matrix **Result */); | extern int findHermiteBasis (/* Matrix *M, Matrix **Result */); | |||
| extern Matrix *Identity (/* unsigned size */); | extern Matrix *Identity (/* unsigned size */); | |||
| extern Bool isinHnf (/* Matrix *A */); | extern Bool isinHnf (/* Matrix *A */); | |||
| extern Bool isIntegral (/* Matrix *A */); | extern Bool isIntegral (/* Matrix *A */); | |||
| extern Value *Lcm (/* Value i, Value j */); | extern Value *Lcm (/* Value i, Value j */); | |||
| extern Matrix * Matrix_Copy (/* Matrix *Src */); | extern Matrix * Matrix_Copy (/* Matrix *Src */); | |||
| extern void PutColumnFirst (/* Matrix *X, int Columnnumber */); | extern void PutColumnFirst (/* Matrix *X, int Columnnumber */); | |||
| extern void PutColumnLast (/* Matrix *X, int Columnnumber */); | extern void PutColumnLast (/* Matrix *X, int Columnnumber */); | |||
| extern void PutRowFirst (/* Matrix *X, int Rownumber */); | extern void PutRowFirst (/* Matrix *X, int Rownumber */); | |||
| extern void PutRowLast (/* Matrix *X, int Rownumber */); | extern void PutRowLast (/* Matrix *X, int Rownumber */); | |||
| extern Matrix *RemoveNColumns (/* Matrix *M, int FirstColumnnumber, int Num Columns */) | ||||
| extern Matrix *RemoveColumn (/* Matrix *M, int Columnnumber */); | extern Matrix *RemoveColumn (/* Matrix *M, int Columnnumber */); | |||
| extern Matrix *RemoveRow (/* Matrix *M, int Rownumber */); | extern Matrix *RemoveRow (/* Matrix *M, int Rownumber */); | |||
| extern Matrix *Transpose (/* Matrix *A */); | extern Matrix *Transpose (/* Matrix *A */); | |||
| #endif /* (defined(__STDC__) || defined(__cplusplus)) */ | #endif /* (defined(__STDC__) || defined(__cplusplus)) */ | |||
| #endif /* _Matop_h_ */ | #endif /* _Matop_h_ */ | |||
| End of changes. 2 change blocks. | ||||
| 0 lines changed or deleted | 2 lines changed or added | |||
| arithmetique.h | arithmetique.h | |||
|---|---|---|---|---|
| skipping to change at line 89 | skipping to change at line 89 | |||
| #ifndef __LONG_LONG_MAX__ | #ifndef __LONG_LONG_MAX__ | |||
| #define __LONG_LONG_MAX__ 9223372036854775807LL | #define __LONG_LONG_MAX__ 9223372036854775807LL | |||
| #endif | #endif | |||
| #undef LONG_LONG_MAX | #undef LONG_LONG_MAX | |||
| #define LONG_LONG_MAX __LONG_LONG_MAX__ | #define LONG_LONG_MAX __LONG_LONG_MAX__ | |||
| #undef LONG_LONG_MIN | #undef LONG_LONG_MIN | |||
| #define LONG_LONG_MIN (-LONG_LONG_MAX-1) | #define LONG_LONG_MIN (-LONG_LONG_MAX-1) | |||
| #undef ULONG_LONG_MAX | #undef ULONG_LONG_MAX | |||
| #define ULONG_LONG_MAX (LONG_LONG_MAX * 2ULL + 1) | #define ULONG_LONG_MAX (LONG_LONG_MAX * 2ULL + 1) | |||
| #endif | ||||
| #endif /* LONG_LONG_MAX */ | ||||
| #if defined(LINEAR_VALUE_IS_LONGLONG) | #if defined(LINEAR_VALUE_IS_LONGLONG) | |||
| #define LINEAR_VALUE_STRING "long long int" | #define LINEAR_VALUE_STRING "long long int" | |||
| typedef long long int Value; | typedef long long int Value; | |||
| #if defined(WIN32) && !defined(unix) | #if defined(WIN32) && !defined(unix) | |||
| /* Mingw or Windows need an incompatible format string. */ | /* Mingw or Windows need an incompatible format string. */ | |||
| # define VALUE_FMT "%I64d" | # define VALUE_FMT "%I64d" | |||
| #else | #else | |||
| # define VALUE_FMT "%lld" | # define VALUE_FMT "%lld" | |||
| skipping to change at line 153 | skipping to change at line 152 | |||
| #elif defined(LINEAR_VALUE_IS_LONG) | #elif defined(LINEAR_VALUE_IS_LONG) | |||
| #define LINEAR_VALUE_STRING "long int" | #define LINEAR_VALUE_STRING "long int" | |||
| typedef long Value; | typedef long Value; | |||
| #define VALUE_FMT "%ld" | #define VALUE_FMT "%ld" | |||
| #define VALUE_CONST(val) (val##L) | #define VALUE_CONST(val) (val##L) | |||
| #define VALUE_NAN LONG_MIN | #define VALUE_NAN LONG_MIN | |||
| #define VALUE_MIN (LONG_MIN+1L) | #define VALUE_MIN (LONG_MIN+1L) | |||
| #define VALUE_MAX LONG_MAX | #define VALUE_MAX LONG_MAX | |||
| <<<<<<< arithmetique.h | ||||
| #define VALUE_SQRT_MIN long_to_value(INT_MIN) | ||||
| #define VALUE_SQRT_MAX long_to_value(INT_MAX) | ||||
| ======= | ||||
| #define VALUE_SQRT_MIN int_to_value(INT_MIN) | #define VALUE_SQRT_MIN int_to_value(INT_MIN) | |||
| #define VALUE_SQRT_MAX int_to_value(INT_MAX) | #define VALUE_SQRT_MAX int_to_value(INT_MAX) | |||
| >>>>>>> 1.23 | ||||
| #define VALUE_ZERO 0L | #define VALUE_ZERO 0L | |||
| #define VALUE_ONE 1L | #define VALUE_ONE 1L | |||
| #define VALUE_MONE -1L | #define VALUE_MONE -1L | |||
| #define VALUE_TO_LONG(val) (val) | #define VALUE_TO_LONG(val) (val) | |||
| #define VALUE_TO_INT(val) ((int)(val)) | #define VALUE_TO_INT(val) ((int)(val)) | |||
| #define VALUE_TO_FLOAT(val) ((float)(val)) | #define VALUE_TO_FLOAT(val) ((float)(val)) | |||
| #define VALUE_TO_DOUBLE(val) ((double)(val)) | #define VALUE_TO_DOUBLE(val) ((double)(val)) | |||
| /* end LINEAR_VALUE_IS_LONG */ | /* end LINEAR_VALUE_IS_LONG */ | |||
| End of changes. 3 change blocks. | ||||
| 7 lines changed or deleted | 1 lines changed or added | |||