Test logarithm 10

build/test/cache/test_fmax.c

@@ -0,0 +1,35 @@
+#include "src/main/c/Calculator/calculator.h"
+#include "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h"
+
+
+
+
+                void test_fmax(void){
+
+
+
+                    double result;
+
+                    double num1;
+
+                    double num2;
+
+                    double max = fmax(14.4,3.4);
+
+
+
+
+
+                    result = max;
+
+
+
+
+
+                    UnityAssertEqualNumber((UNITY_INT)((14.4)), (UNITY_INT)((result)), (
+
+                   ((void *)0)
+
+                   ), (UNITY_UINT)(25), UNITY_DISPLAY_STYLE_INT);
+
+                }

build/test/cache/test_log10.c

@@ -0,0 +1,49 @@
+#include "src/main/c/Calculator/calculator.h"
+#include "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h"
+
+
+
+
+
+
+void setUp(void){
+
+
+
+}
+
+void tearDown(void){
+
+}
+
+
+
+
+
+void test_log10(void){
+
+
+
+    double result;
+
+    double a = 20;
+
+    result = log10(a);
+
+
+
+
+
+    return result;
+
+
+
+
+
+    UnityAssertEqualNumber((UNITY_INT)((20)), (UNITY_INT)((result)), (
+
+   ((void *)0)
+
+   ), (UNITY_UINT)(23), UNITY_DISPLAY_STYLE_INT);
+
+}

build/test/dependencies/test_fmax.d

@@ -0,0 +1,4 @@
+build/test/out/c/test_fmax.o: test/Calculator/test_fmax.c \
+ /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \
+ /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h \
+ src/main/c/Calculator/calculator.h

build/test/dependencies/test_fmax_runner.d

@@ -0,0 +1,4 @@
+build/test/out/c/test_fmax_runner.o: \
+ build/test/runners/test_fmax_runner.c \
+ /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \
+ /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h

build/test/dependencies/test_log10.d

@@ -0,0 +1,4 @@
+build/test/out/c/test_log10.o: test/Calculator/test_log10.c \
+ /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \
+ /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h \
+ src/main/c/Calculator/calculator.h

build/test/dependencies/test_log10_runner.d

@@ -0,0 +1,4 @@
+build/test/out/c/test_log10_runner.o: \
+ build/test/runners/test_log10_runner.c \
+ /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \
+ /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h

build/test/preprocess/files/test_fmax.c

@@ -0,0 +1,35 @@
+#include "src/main/c/Calculator/calculator.h"
+#include "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h"
+
+
+
+
+                void test_fmax(void){
+
+
+
+                    double result;
+
+                    double num1;
+
+                    double num2;
+
+                    double max = fmax(14.4,3.4);
+
+
+
+
+
+                    result = max;
+
+
+
+
+
+                    UnityAssertEqualNumber((UNITY_INT)((14.4)), (UNITY_INT)((result)), (
+
+                   ((void *)0)
+
+                   ), (UNITY_UINT)(25), UNITY_DISPLAY_STYLE_INT);
+
+                }

build/test/preprocess/files/test_log10.c

@@ -0,0 +1,49 @@
+#include "src/main/c/Calculator/calculator.h"
+#include "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h"
+
+
+
+
+
+
+void setUp(void){
+
+
+
+}
+
+void tearDown(void){
+
+}
+
+
+
+
+
+void test_log10(void){
+
+
+
+    double result;
+
+    double a = 20;
+
+    result = log10(a);
+
+
+
+
+
+    return result;
+
+
+
+
+
+    UnityAssertEqualNumber((UNITY_INT)((20)), (UNITY_INT)((result)), (
+
+   ((void *)0)
+
+   ), (UNITY_UINT)(23), UNITY_DISPLAY_STYLE_INT);
+
+}

build/test/preprocess/includes/test_fmax.c

@@ -0,0 +1,3 @@
+---
+- "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h"
+- src/main/c/Calculator/calculator.h

build/test/preprocess/includes/test_log10.c

@@ -0,0 +1,3 @@
+---
+- "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h"
+- src/main/c/Calculator/calculator.h

build/test/results/test_add.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0006854459934402257
+:time: 0.0031575530010741204

build/test/results/test_cbrt.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0007552689930889755
+:time: 0.006589814991457388

build/test/results/test_ceil.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.000791327009210363
+:time: 0.00605196098331362

build/test/results/test_divide.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0007838979945518076
+:time: 0.006208898994373158

build/test/results/test_exp.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0007327220228035003
+:time: 0.006314277008641511

build/test/results/test_factorial.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0007816760044079274
+:time: 0.006333274010103196

build/test/results/test_floor.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.000812580983620137
+:time: 0.006300724984612316

build/test/results/test_fmax.pass

@@ -0,0 +1,18 @@
+---
+:source:
+  :path: test/Calculator
+  :file: test_fmax.c
+:successes:
+- :test: test_fmax
+  :line: 14
+  :message: ''
+  :unity_test_time: 0
+:failures: []
+:ignores: []
+:counts:
+  :total: 1
+  :passed: 1
+  :failed: 0
+  :ignored: 0
+:stdout: []
+:time: 0.006286512012593448

build/test/results/test_log.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0007323859899770468
+:time: 0.003080766007769853

build/test/results/test_log10.pass

@@ -0,0 +1,18 @@
+---
+:source:
+  :path: test/Calculator
+  :file: test_log10.c
+:successes:
+- :test: test_log10
+  :line: 13
+  :message: ''
+  :unity_test_time: 0
+:failures: []
+:ignores: []
+:counts:
+  :total: 1
+  :passed: 1
+  :failed: 0
+  :ignored: 0
+:stdout: []
+:time: 0.006343023007502779

build/test/results/test_mod.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0007842250051908195
+:time: 0.006334662000881508

build/test/results/test_multiply.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0007811810064595193
+:time: 0.004287940013455227

build/test/results/test_pow.pass

@@ -19,4 +19,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0008296039886772633
+:time: 0.006217798014404252

build/test/results/test_round.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.003075557993724942
+:time: 0.006286452000495046

build/test/results/test_sin.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0007345140038523823
+:time: 0.006029690994182602

build/test/results/test_sqrt.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.000786467018770054
+:time: 0.006369120994349942

build/test/results/test_subtract.pass

@@ -15,4 +15,4 @@
   :failed: 0
   :ignored: 0
 :stdout: []
-:time: 0.0007993110048118979
+:time: 0.006361763982567936

build/test/runners/test_fmax_runner.c

@@ -0,0 +1,87 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+/*=======Automagically Detected Files To Include=====*/
+#include "unity.h"
+
+int GlobalExpectCount;
+int GlobalVerifyOrder;
+char* GlobalOrderError;
+
+/*=======External Functions This Runner Calls=====*/
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_fmax(void);
+
+
+/*=======Mock Management=====*/
+static void CMock_Init(void)
+{
+  GlobalExpectCount = 0;
+  GlobalVerifyOrder = 0;
+  GlobalOrderError = NULL;
+}
+static void CMock_Verify(void)
+{
+}
+static void CMock_Destroy(void)
+{
+}
+
+/*=======Setup (stub)=====*/
+void setUp(void) {}
+
+/*=======Teardown (stub)=====*/
+void tearDown(void) {}
+
+/*=======Test Reset Options=====*/
+void resetTest(void);
+void resetTest(void)
+{
+  tearDown();
+  CMock_Verify();
+  CMock_Destroy();
+  CMock_Init();
+  setUp();
+}
+void verifyTest(void);
+void verifyTest(void)
+{
+  CMock_Verify();
+}
+
+/*=======Test Runner Used To Run Each Test=====*/
+static void run_test(UnityTestFunction func, const char* name, UNITY_LINE_TYPE line_num)
+{
+    Unity.CurrentTestName = name;
+    Unity.CurrentTestLineNumber = line_num;
+#ifdef UNITY_USE_COMMAND_LINE_ARGS
+    if (!UnityTestMatches())
+        return;
+#endif
+    Unity.NumberOfTests++;
+    UNITY_CLR_DETAILS();
+    UNITY_EXEC_TIME_START();
+    CMock_Init();
+    if (TEST_PROTECT())
+    {
+        setUp();
+        func();
+    }
+    if (TEST_PROTECT())
+    {
+        tearDown();
+        CMock_Verify();
+    }
+    CMock_Destroy();
+    UNITY_EXEC_TIME_STOP();
+    UnityConcludeTest();
+}
+
+/*=======MAIN=====*/
+int main(void)
+{
+  UnityBegin("test_fmax.c");
+  run_test(test_fmax, "test_fmax", 14);
+
+  return UnityEnd();
+}

build/test/runners/test_log10_runner.c

@@ -0,0 +1,81 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+/*=======Automagically Detected Files To Include=====*/
+#include "unity.h"
+
+int GlobalExpectCount;
+int GlobalVerifyOrder;
+char* GlobalOrderError;
+
+/*=======External Functions This Runner Calls=====*/
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_log10(void);
+
+
+/*=======Mock Management=====*/
+static void CMock_Init(void)
+{
+  GlobalExpectCount = 0;
+  GlobalVerifyOrder = 0;
+  GlobalOrderError = NULL;
+}
+static void CMock_Verify(void)
+{
+}
+static void CMock_Destroy(void)
+{
+}
+
+/*=======Test Reset Options=====*/
+void resetTest(void);
+void resetTest(void)
+{
+  tearDown();
+  CMock_Verify();
+  CMock_Destroy();
+  CMock_Init();
+  setUp();
+}
+void verifyTest(void);
+void verifyTest(void)
+{
+  CMock_Verify();
+}
+
+/*=======Test Runner Used To Run Each Test=====*/
+static void run_test(UnityTestFunction func, const char* name, UNITY_LINE_TYPE line_num)
+{
+    Unity.CurrentTestName = name;
+    Unity.CurrentTestLineNumber = line_num;
+#ifdef UNITY_USE_COMMAND_LINE_ARGS
+    if (!UnityTestMatches())
+        return;
+#endif
+    Unity.NumberOfTests++;
+    UNITY_CLR_DETAILS();
+    UNITY_EXEC_TIME_START();
+    CMock_Init();
+    if (TEST_PROTECT())
+    {
+        setUp();
+        func();
+    }
+    if (TEST_PROTECT())
+    {
+        tearDown();
+        CMock_Verify();
+    }
+    CMock_Destroy();
+    UNITY_EXEC_TIME_STOP();
+    UnityConcludeTest();
+}
+
+/*=======MAIN=====*/
+int main(void)
+{
+  UnityBegin("test_log10.c");
+  run_test(test_log10, "test_log10", 13);
+
+  return UnityEnd();
+}

src/main/c/Calculator/calculator.c

@@ -24,6 +24,9 @@ double exp(double num1);
 double ceil(double num1);
 double floor(double num1);
 double round(double num1);
+double  fmax(double num1,double num2);
+double  log10(double num1);
+//double exp2(double num1);
 
     int calculator() {
     int choice;
@@ -87,8 +90,11 @@ double round(double num1);
         printf("21. Exponent\n");
         printf("22. Floor\n");
         printf("23. Round\n");
-//    
-        printf("21. Exit\n");
+        printf("24. fmaximum");
+        printf("25. base 10 logarithm");
+//     printf("26. 2 raise to the power");
+//      printf("27 trunc");
+        printf("28. Exit\n");
     }
     double performOperation(int choice, double num1, double num2) {
     switch (choice) {
@@ -139,6 +145,14 @@ double round(double num1);
             return 0; floor(num1);
         case 23:
             return 0; round(num1);
+        case 24: 
+            return 0; fmax(num1,num2);
+        case 25:
+            return 0; log10(num1);
+//      case 26:
+//         return 0; exp2(num1);
+//      case 27:
+//       return 0; trunc(num1);
         default:
             return 0.0;
     }
@@ -231,3 +245,21 @@ double round(double num1){
     double result = num1;
     return result;
 }
+double fmax(double num1 , double num2){
+    double  maximum =  fmax(num1,num2) ;
+    return maximum;
+}
+
+double log10(double num1){
+    double result = num1;
+    return result;
+}/*
+double log10(double num1){
+    double result = num1;
+    return result;
+}
+double trunc(double num1){
+   double result =  num1;
+   return result;
+}
+*/

src/main/c/Calculator/calculator.h

@@ -16,4 +16,6 @@ double exp(double num1);
 double ceil(double num1);
 double floor(double num1);
 double round(double num1);
+double fmax(double num1, double num2);
+double log10(double num1);
 #endif

test/Calculator/test_fmax.c

@@ -0,0 +1,28 @@
+
+                #ifdef TEST
+                #include "unity.h"
+                #include "calculator.h"
+
+/*
+               ( void setUp(void){
+                    //Wenn Funktion Vorraussetzungen braucht
+                }
+                void tearDown(void){
+                }
+*/
+
+                void test_fmax(void){
+                    /* arrange */
+                    double result;
+                    double num1;
+                    double num2;
+                    double max = fmax(14.4,3.4);
+
+                    /* act */
+                    result =  max;
+
+                    /* assert */
+                    TEST_ASSERT_EQUAL_INT(14.4, result);// fmax(14.4,3.4);
+                }                  
+
+                #endif // TEST

test/Calculator/test_log10.c

@@ -0,0 +1,26 @@
+#ifdef TEST
+#include "unity.h"
+#include "calculator.h"
+
+
+void setUp(void){
+    //Wenn Funktion Vorraussetzungen braucht
+}
+void tearDown(void){
+}
+
+
+void test_log10(void){
+    /* arrange */
+    double result;
+    double a = 20;
+    result = log10(a);
+
+    /* act */
+    return result;
+
+    /* assert */
+    TEST_ASSERT_EQUAL_INT(20, result);//log10 (20) = 20;
+}
+
+#endif // TEST