Jingga/cOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/cOMS.git synced 2026-02-15 01:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix minor bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-09-26 23:28:39 +02:00
parent 7b31df32bc
commit 42588dee24
3 changed files with 24 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Utils/MathUtils.h
View File

@ -12,34 +12,10 @@
#define OMS_PI 3.14159265358979323846 #define OMS_PI 3.14159265358979323846
#ifdef _MSC_VER #define oms_max(a, b) ((a) > (b) ? (a) : (b))
#define oms_max(a, b) ((a) > (b) ? (a) : (b)) #define oms_min(a, b) ((a) > (b) ? (b) : (a))
#define oms_min(a, b) ((a) > (b) ? (b) : (a)) #define oms_abs(a) ((a) > 0 ? (a) : -(a))
#define oms_abs(a) ((a) > 0 ? (a) : -(a)) #define oms_deg2rad(angle) ((angle) * OMS_PI / 180.0)
#define oms_deg2rad(angle) ((angle) * OMS_PI / 180.0) #define oms_rad2deg(angle) ((angle) * 180.0 / OMS_PI)
#define oms_rad2deg(angle) ((angle) * 180.0 / OMS_PI)
#else
#define oms_max(a, b) \
( __typeof__(a) _a = (a); \
__typeof__(b) _b = (b); \
_a > _b ? _a : _b; )
#define oms_min(a, b) \
( __typeof__(a) _a = (a); \
__typeof__(b) _b = (b); \
_a < _b ? _a : _b; )
#define oms_abs(a) \
( __typeof__(a) _a = (a); \
_a > 0 ? _a : -_a; )
#define oms_deg2rad(angle) \
( __typeof__(angle) _angle = (angle); \
(_angle) * OMS_PI / 180.0; )
#define oms_rad2deg(angle) \
( __typeof__(angle) _angle = (angle); \
(_angle) * 180.0 / OMS_PI; )
#endif
#endif #endif

2
Utils/StringUtils.h
View File

@ -103,7 +103,7 @@ namespace Utils {
--i; --i;
++diffIndex; ++diffIndex;
continue continue;
} }
diffValues[diffIndex] = (char *) malloc((strlen(from[i - 1]) + 1) * sizeof(char)); diffValues[diffIndex] = (char *) malloc((strlen(from[i - 1]) + 1) * sizeof(char));

64
Utils/TestUtils.h
View File

@ -13,52 +13,24 @@
#include <stdio.h> #include <stdio.h>
#include "MathUtils.h" #include "MathUtils.h"
#ifdef _MSC_VER #define ASSERT_EQUALS(a, b, t1, t2) (\
#define ASSERT_EQUALS(a, b, t1, t2) (\ if ((a) == (b)) { \
if ((a) == (b)) { \ printf("."); \
printf("."); \ } else { \
} else { \ printf("[F]"); \
printf("[F]"); \ printf("\n\n%s - %i: ", __FILE__, __LINE__); \
printf("\n\n%s - %i: ", __FILE__, __LINE__); \ printf((t1), (a)); printf(" != "); printf((t2), (b)); printf("\n"); \
printf((t1), (a)); printf(" != "); printf((t2), (b)); printf("\n"); \ return 0; } \
return 0; } \ )
)
#define ASSERT_EQUALS_WITH_DELTA(a, b, delta, t1, t2) (\ #define ASSERT_EQUALS_WITH_DELTA(a, b, delta, t1, t2) (\
if (oms_abs((a) - (b)) <= (delta)) { \ if (oms_abs((a) - (b)) <= (delta)) { \
printf("."); \ printf("."); \
} else { \ } else { \
printf("[F]"); \ printf("[F]"); \
printf("\n\n%s - %i: ", __FILE__, __LINE__); \ printf("\n\n%s - %i: ", __FILE__, __LINE__); \
printf((t1), (a)); printf(" != "); printf((t2), (b)); printf("\n"); \ printf((t1), (a)); printf(" != "); printf((t2), (b)); printf("\n"); \
return 0; } \ return 0; } \
) )
#else
#define ASSERT_EQUALS(a, b, t1, t2) \
({ __typeof__ (a) _a = (a); \
__typeof__ (b) _b = (b); \
if (_a == _b) { \
printf("."); \
} else { \
printf("[F]"); \
printf("\n\n%s - %i: ", __FILE__, __LINE__); \
printf(t1, _a); printf(" != "); printf(t2, _b); printf("\n"); \
return 0; } \
})
#define ASSERT_EQUALS_WITH_DELTA(a, b, delta, t1, t2) \
({ __typeof__ (a) _a = (a); \
__typeof__ (b) _b = (b); \
__typeof__ (delta) _delta = (delta); \
__typeof__ (delta) _d = (_a - _b); \
if (oms_abs(_d) <= _delta) { \
printf("."); \
} else { \
printf("[F]"); \
printf("\n\n%s - %i: ", __FILE__, __LINE__); \
printf(t1, _a); printf(" != "); printf(t2, _b); printf("\n"); \
return 0; } \
})
#endif
#endif #endif