From a724fbd695c1c2bb53746672f2f470d308408f44 Mon Sep 17 00:00:00 2001 From: Lewis Van Winkle Date: Tue, 23 Aug 2016 16:01:41 -0500 Subject: [PATCH] Added additional tests. --- Makefile | 8 +++++--- test.c | 25 +++++++++++++++++-------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index bc97935..0b255c2 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,16 @@ CCFLAGS = -ansi -Wall -Wshadow -O2 LFLAGS = -lm -all: test bench example example2 example3 +all: test test_pr bench example example2 example3 -test: test.o tinyexpr.o +test: test.c tinyexpr.c $(CC) $(CCFLAGS) -o $@ $^ $(LFLAGS) ./$@ +test_pr: test.c tinyexpr.c + $(CC) $(CCFLAGS) -DTE_POW_FROM_RIGHT -DTE_NAT_LOG -o $@ $^ $(LFLAGS) + ./$@ bench: benchmark.o tinyexpr.o $(CC) $(CCFLAGS) -o $@ $^ $(LFLAGS) @@ -25,7 +28,6 @@ example3: example3.o tinyexpr.o .c.o: $(CC) -c $(CCFLAGS) $< -o $@ - clean: rm *.o rm *.exe diff --git a/test.c b/test.c index cd5779c..c3ca611 100644 --- a/test.c +++ b/test.c @@ -90,15 +90,24 @@ void test_results() { {"asin sin (-0.5)", -0.5}, {"(asin sin (-0.5))", -0.5}, - {"log 1000", 3}, - {"log 1e3", 3}, - {"log 1000", 3}, - {"log 1e3", 3}, - {"log(1000)", 3}, - {"log(1e3)", 3}, - {"log 1.0e3", 3}, + {"log10 1000", 3}, + {"log10 1e3", 3}, + {"log10 1000", 3}, + {"log10 1e3", 3}, + {"log10(1000)", 3}, + {"log10(1e3)", 3}, + {"log10 1.0e3", 3}, {"10^5*5e-5", 5}, +#ifdef TE_NAT_LOG + {"log 1000", 6.9078}, + {"log e", 1}, + {"log (e^10)", 10}, +#else + {"log 1000", 3}, +#endif + + {"ln (e^10)", 10}, {"100^.5+1", 11}, {"100 ^.5+1", 11}, {"100^+.5+1", 11}, @@ -320,7 +329,7 @@ void test_functions() { cross_check("exp x", exp(x)); cross_check("floor x", floor(x)); cross_check("ln x", log(x)); - cross_check("log x", log10(x)); + cross_check("log10 x", log10(x)); cross_check("sin x", sin(x)); cross_check("sinh x", sinh(x)); cross_check("sqrt x", sqrt(x));