rainlance
/
amath
mirror of https://gitlab.com/rnger/amath
1
0
Fork 0
Code Releases Wiki Activity

Minor fixes

This commit is contained in:
llsth 2015-04-13 00:05:17 +02:00
parent 8bec52a8ee
commit 6d7ae73543
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
def/text.h
View File

@ -94,8 +94,9 @@
#define ACPU "68060"
#endif
#if defined(INTELCPU) || defined(i386) || defined(i486) || \
defined(intel) || defined(x86) || defined(i86pc)
#if defined(INTELCPU) || defined(i386) || defined(i486) || \
defined(intel) || defined(x86) || defined(i86pc) || \
defined(__i386__) || defined(_M_IX86)
#ifdef ACPU
#undef ACPU
#endif
@ -106,10 +107,11 @@
#define ACPU "PowerPC"
#endif
#ifdef AROS
#define ASYSNAME SPACE "AROS"
#else
#define ASYSNAME EMPTYSTRING
#if defined(__x86_64__)
#ifdef ACPU
#undef ACPU
#endif
#define ACPU "amd64"
#endif
#ifdef WITHTEST
@ -132,11 +134,12 @@
// ------------ Title and copyright texts --------------
// -----------------------------------------------------
#define ARCH ACPU AFPU ASYSNAME ATEST
#define ATITLE "amath version 1.5.7"
#define ACOPYRIGHT "(c) 2015 Carsten Sonne Larsen"
#define ASTARTMSG ATITLE SPACE ARCH SPACE ACOPYRIGHT
#define DOSVERSION "\0$VER: amath 1.57 (12-04-2015)"
#define ARCH ACPU AFPU ATEST
#define ATITLE "amath version 1.5.7"
#define ACOPYRIGHT "(c) 2015 Carsten Sonne Larsen"
#define ASTARTMSG ATITLE SPACE ARCH SPACE ACOPYRIGHT
#define AVERSION "\0$VER: amath 1.57 (12-04-2015)"
#define DOSVERSION AVERSION SPACE ACPU AFPU ATEST
// -----------------------------------------------------
// ------------ Console control characters -------------

2
prog/program.h
View File

@ -41,7 +41,7 @@
#include "main/functions.h"
class Program;
extern Program *Program;
extern class Program *Program;
/**
* @brief Master control class.

13
prog/test.cpp
View File

@ -44,9 +44,10 @@ Test::~Test()
void Test::Run()
{
debug = false;
debug = true;
RunTests();
/*
if (fail == 0) {
printf("All tests passed (%i).\n", pass);
} else {
@ -55,6 +56,7 @@ void Test::Run()
RunTests();
printf("Passed: %i, failed: %i\n", pass, fail);
}
*/
}
void Test::RunTests()
@ -109,6 +111,7 @@ void Test::RunTestset1()
{
Program->Input->SetDigits(9);
Program->Output->SetDigits(9);
TestExpression("-1", "-1 = -1");
TestExpression("-(-1)", "1 = 1");
TestExpression("2+3*4+5", "2+3*4+5 = 19");
@ -205,6 +208,7 @@ void Test::RunTestset3()
{
Program->Output->SetDigits(9);
Program->Output->SetDigits(11);
TestExpression("-(1-2i)", "-(1-2i) = -1+2i");
TestExpression("-2i-(-3i)", "-2i-(-3i) = 1i");
TestExpression("1-2i+5.3i-2.1", "1-2i+(-2.1+5.3i) = -1.1+3.3i");
@ -230,9 +234,9 @@ void Test::RunTestset3()
TestExpression("abs(2.1-3.7i)", "abs(2.1-3.7i) = 4.2544094772");
TestExpression("abs(-2.1+3.7i)", "abs(-2.1+3.7i) = 4.2544094772");
TestExpression("abs(-2.1-3.7i)", "abs(-2.1-3.7i) = 4.2544094772");
TestExpression("sgn(2.1-3.7i)", "sgn(2.1-3.7i) = 1-1i");
TestExpression("sgn(-2.1+3.7i)", "sgn(-2.1+3.7i) = -1+1i");
TestExpression("sgn(-2.1-3.7i)", "sgn(-2.1-3.7i) = -1-1i");
TestExpression("sgn(2.1-3.7i)", "sgn(2.1-3.7i) = 1");
TestExpression("sgn(-2.1+3.7i)", "sgn(-2.1+3.7i) = -1");
TestExpression("sgn(-2.1-3.7i)", "sgn(-2.1-3.7i) = -1");
TestExpression("round(1.5461+2.57i)", "round(1.5461+2.57i) = 2+3i");
TestExpression("round(-1.5461-2.57i)", "round(-1.5461-2.57i) = -2-3i");
TestExpression("ceil(43.5461+2.57i)", "ceil(43.5461+2.57i) = 44+3i");
@ -262,6 +266,7 @@ void Test::RunTestset4()
{
Program->Output->SetDigits(9);
Program->Output->SetDigits(14);
TestExpression("cos(1+2i)", "cos(1+2i) = 2.0327230070197-3.0518977991518i");
TestExpression("sin(1+2i)", "sin(1+2i) = 3.1657785132162+1.9596010414216i");
TestExpression("tan(1+2i)", "tan(1+2i) = 0.0338128260799+1.0147936161466i");