diff --git a/build/test/out/c/funktion.o b/build/test/out/c/funktion.o index 8c185a4..aa71677 100644 Binary files a/build/test/out/c/funktion.o and b/build/test/out/c/funktion.o differ diff --git a/build/test/out/test_Akkortrichtsatz.out b/build/test/out/test_Akkortrichtsatz.out index fcb423f..a8feef9 100755 Binary files a/build/test/out/test_Akkortrichtsatz.out and b/build/test/out/test_Akkortrichtsatz.out differ diff --git a/build/test/out/test_Anlagenabnutzungsgrad.out b/build/test/out/test_Anlagenabnutzungsgrad.out index 68bf3be..a9d7c91 100755 Binary files a/build/test/out/test_Anlagenabnutzungsgrad.out and b/build/test/out/test_Anlagenabnutzungsgrad.out differ diff --git a/build/test/out/test_Anlagenintensitaet.out b/build/test/out/test_Anlagenintensitaet.out index cd1ed26..6db8e01 100755 Binary files a/build/test/out/test_Anlagenintensitaet.out and b/build/test/out/test_Anlagenintensitaet.out differ diff --git a/build/test/out/test_Anlagenproduktivitaet.out b/build/test/out/test_Anlagenproduktivitaet.out index 4d382d3..54a63ef 100755 Binary files a/build/test/out/test_Anlagenproduktivitaet.out and b/build/test/out/test_Anlagenproduktivitaet.out differ diff --git a/build/test/out/test_Arbeitsproduktivitaet.out b/build/test/out/test_Arbeitsproduktivitaet.out index 344edbc..c48b9fc 100755 Binary files a/build/test/out/test_Arbeitsproduktivitaet.out and b/build/test/out/test_Arbeitsproduktivitaet.out differ diff --git a/build/test/out/test_Cashflow_zu_Gesamtkapital.out b/build/test/out/test_Cashflow_zu_Gesamtkapital.out index bb22aa9..1267733 100755 Binary files a/build/test/out/test_Cashflow_zu_Gesamtkapital.out and b/build/test/out/test_Cashflow_zu_Gesamtkapital.out differ diff --git a/build/test/out/test_Dynamische_Amortisationszeit.out b/build/test/out/test_Dynamische_Amortisationszeit.out index 22a82f1..00679cd 100755 Binary files a/build/test/out/test_Dynamische_Amortisationszeit.out and b/build/test/out/test_Dynamische_Amortisationszeit.out differ diff --git a/build/test/out/test_Effektivverzinsung.out b/build/test/out/test_Effektivverzinsung.out index e61c679..8568d3f 100755 Binary files a/build/test/out/test_Effektivverzinsung.out and b/build/test/out/test_Effektivverzinsung.out differ diff --git a/build/test/out/test_Finanzierungsregeln.out b/build/test/out/test_Finanzierungsregeln.out index 3651352..5efb25c 100755 Binary files a/build/test/out/test_Finanzierungsregeln.out and b/build/test/out/test_Finanzierungsregeln.out differ diff --git a/build/test/out/test_GewinnMaximum.out b/build/test/out/test_GewinnMaximum.out index 0c723f1..3228a90 100755 Binary files a/build/test/out/test_GewinnMaximum.out and b/build/test/out/test_GewinnMaximum.out differ diff --git a/build/test/out/test_Kalkulatorische_Zinsen.out b/build/test/out/test_Kalkulatorische_Zinsen.out index caab85d..cbd277e 100755 Binary files a/build/test/out/test_Kalkulatorische_Zinsen.out and b/build/test/out/test_Kalkulatorische_Zinsen.out differ diff --git a/build/test/out/test_Kritische_Menge.out b/build/test/out/test_Kritische_Menge.out index 9b42b45..d07a142 100755 Binary files a/build/test/out/test_Kritische_Menge.out and b/build/test/out/test_Kritische_Menge.out differ diff --git a/build/test/out/test_Stueckzeitakkort.out b/build/test/out/test_Stueckzeitakkort.out index 5e69ad8..15d2fca 100755 Binary files a/build/test/out/test_Stueckzeitakkort.out and b/build/test/out/test_Stueckzeitakkort.out differ diff --git a/build/test/out/test_Vadd.out b/build/test/out/test_Vadd.out index a3ad7f9..e05e29d 100755 Binary files a/build/test/out/test_Vadd.out and b/build/test/out/test_Vadd.out differ diff --git a/build/test/out/test_Vaddx2.out b/build/test/out/test_Vaddx2.out index e607852..9858eba 100755 Binary files a/build/test/out/test_Vaddx2.out and b/build/test/out/test_Vaddx2.out differ diff --git a/build/test/out/test_Vaddx3.out b/build/test/out/test_Vaddx3.out index 7764d1d..9f86d4a 100755 Binary files a/build/test/out/test_Vaddx3.out and b/build/test/out/test_Vaddx3.out differ diff --git a/build/test/out/test_Vlength.out b/build/test/out/test_Vlength.out index 3873ec2..8eaa1bc 100755 Binary files a/build/test/out/test_Vlength.out and b/build/test/out/test_Vlength.out differ diff --git a/build/test/out/test_Vshift.out b/build/test/out/test_Vshift.out index 44a9704..7403ac7 100755 Binary files a/build/test/out/test_Vshift.out and b/build/test/out/test_Vshift.out differ diff --git a/build/test/out/test_Vsubstract.out b/build/test/out/test_Vsubstract.out index d5001d8..5973731 100755 Binary files a/build/test/out/test_Vsubstract.out and b/build/test/out/test_Vsubstract.out differ diff --git a/build/test/out/test_Vsubstract2.out b/build/test/out/test_Vsubstract2.out index 46e4d6b..8a3b402 100755 Binary files a/build/test/out/test_Vsubstract2.out and b/build/test/out/test_Vsubstract2.out differ diff --git a/build/test/out/test_Vsubstract3.out b/build/test/out/test_Vsubstract3.out index f1afdc5..c328f67 100755 Binary files a/build/test/out/test_Vsubstract3.out and b/build/test/out/test_Vsubstract3.out differ diff --git a/build/test/out/test_Zeitlohn.out b/build/test/out/test_Zeitlohn.out index ee21764..230380e 100755 Binary files a/build/test/out/test_Zeitlohn.out and b/build/test/out/test_Zeitlohn.out differ diff --git a/build/test/out/test_angebotserfolg.out b/build/test/out/test_angebotserfolg.out index 5189241..476a900 100755 Binary files a/build/test/out/test_angebotserfolg.out and b/build/test/out/test_angebotserfolg.out differ diff --git a/build/test/out/test_eigenkapital_Rentabilitaeten.out b/build/test/out/test_eigenkapital_Rentabilitaeten.out index a4507cb..f557ba1 100755 Binary files a/build/test/out/test_eigenkapital_Rentabilitaeten.out and b/build/test/out/test_eigenkapital_Rentabilitaeten.out differ diff --git a/build/test/out/test_erloesfunktion.out b/build/test/out/test_erloesfunktion.out index e2ef585..5785cf4 100755 Binary files a/build/test/out/test_erloesfunktion.out and b/build/test/out/test_erloesfunktion.out differ diff --git a/build/test/out/test_gesamtkapital_Rentabilitaeten.out b/build/test/out/test_gesamtkapital_Rentabilitaeten.out index fe6c1c2..f903a5d 100755 Binary files a/build/test/out/test_gesamtkapital_Rentabilitaeten.out and b/build/test/out/test_gesamtkapital_Rentabilitaeten.out differ diff --git a/build/test/out/test_grenzGewinn.out b/build/test/out/test_grenzGewinn.out index b952aa7..940215b 100755 Binary files a/build/test/out/test_grenzGewinn.out and b/build/test/out/test_grenzGewinn.out differ diff --git a/build/test/out/test_marktanteil.out b/build/test/out/test_marktanteil.out index c29726e..8f84428 100755 Binary files a/build/test/out/test_marktanteil.out and b/build/test/out/test_marktanteil.out differ diff --git a/build/test/out/test_trapezFlaeche.out b/build/test/out/test_trapezFlaeche.out index 2cea8be..96a67f4 100755 Binary files a/build/test/out/test_trapezFlaeche.out and b/build/test/out/test_trapezFlaeche.out differ diff --git a/build/test/results/test_Akkortrichtsatz.pass b/build/test/results/test_Akkortrichtsatz.pass index d86a5ac..3e7f079 100644 --- a/build/test/results/test_Akkortrichtsatz.pass +++ b/build/test/results/test_Akkortrichtsatz.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 552.000000 -:time: 0.0011916439998458372 +:time: 0.0034779289999278262 diff --git a/build/test/results/test_Anlagenabnutzungsgrad.pass b/build/test/results/test_Anlagenabnutzungsgrad.pass index 2420e4b..1938d1a 100644 --- a/build/test/results/test_Anlagenabnutzungsgrad.pass +++ b/build/test/results/test_Anlagenabnutzungsgrad.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 60.000000 -:time: 0.004062791000251309 +:time: 0.0012586769998961245 diff --git a/build/test/results/test_Anlagenintensitaet.pass b/build/test/results/test_Anlagenintensitaet.pass index 2da125b..9daa6a7 100644 --- a/build/test/results/test_Anlagenintensitaet.pass +++ b/build/test/results/test_Anlagenintensitaet.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 4878.048780 -:time: 0.002316302000053838 +:time: 0.0020376969996505068 diff --git a/build/test/results/test_Anlagenproduktivitaet.pass b/build/test/results/test_Anlagenproduktivitaet.pass index b76cc53..7360747 100644 --- a/build/test/results/test_Anlagenproduktivitaet.pass +++ b/build/test/results/test_Anlagenproduktivitaet.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 18.203304 -:time: 0.0019596529996306344 +:time: 0.0016753300001255411 diff --git a/build/test/results/test_Arbeitsproduktivitaet.pass b/build/test/results/test_Arbeitsproduktivitaet.pass index efa20e5..fed6047 100644 --- a/build/test/results/test_Arbeitsproduktivitaet.pass +++ b/build/test/results/test_Arbeitsproduktivitaet.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 60.000000 -:time: 0.0014363260002028255 +:time: 0.0022975860001679393 diff --git a/build/test/results/test_Cashflow_zu_Gesamtkapital.pass b/build/test/results/test_Cashflow_zu_Gesamtkapital.pass index 977816a..390801b 100644 --- a/build/test/results/test_Cashflow_zu_Gesamtkapital.pass +++ b/build/test/results/test_Cashflow_zu_Gesamtkapital.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 0.158038 -:time: 0.002055373000075633 +:time: 0.0011968789999627916 diff --git a/build/test/results/test_Dynamische_Amortisationszeit.pass b/build/test/results/test_Dynamische_Amortisationszeit.pass index 718ade9..7c2ebf8 100644 --- a/build/test/results/test_Dynamische_Amortisationszeit.pass +++ b/build/test/results/test_Dynamische_Amortisationszeit.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 189.421906 -:time: 0.0012149599997428595 +:time: 0.0014438329999393318 diff --git a/build/test/results/test_Effektivverzinsung.pass b/build/test/results/test_Effektivverzinsung.pass index da751a2..cb6b08d 100644 --- a/build/test/results/test_Effektivverzinsung.pass +++ b/build/test/results/test_Effektivverzinsung.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 16.034390 -:time: 0.0020793129997400683 +:time: 0.0021674159997928655 diff --git a/build/test/results/test_Finanzierungsregeln.pass b/build/test/results/test_Finanzierungsregeln.pass index b98bfbd..cd8e60f 100644 --- a/build/test/results/test_Finanzierungsregeln.pass +++ b/build/test/results/test_Finanzierungsregeln.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 0.051041 -:time: 0.001214873000208172 +:time: 0.0011690450000969577 diff --git a/build/test/results/test_GewinnMaximum.pass b/build/test/results/test_GewinnMaximum.pass index c46266c..a31b24f 100644 --- a/build/test/results/test_GewinnMaximum.pass +++ b/build/test/results/test_GewinnMaximum.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 251.000000 -:time: 0.002470935000019381 +:time: 0.0012708089998341165 diff --git a/build/test/results/test_Kalkulatorische_Zinsen.pass b/build/test/results/test_Kalkulatorische_Zinsen.pass index f333518..26e3552 100644 --- a/build/test/results/test_Kalkulatorische_Zinsen.pass +++ b/build/test/results/test_Kalkulatorische_Zinsen.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 1.440000 -:time: 0.0015604630002599151 +:time: 0.001587227000072744 diff --git a/build/test/results/test_Kritische_Menge.pass b/build/test/results/test_Kritische_Menge.pass index 60779df..3f9e23e 100644 --- a/build/test/results/test_Kritische_Menge.pass +++ b/build/test/results/test_Kritische_Menge.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss -12.096026 -:time: 0.0016033349997996993 +:time: 0.001252633000149217 diff --git a/build/test/results/test_Stueckzeitakkort.pass b/build/test/results/test_Stueckzeitakkort.pass index d76bb80..57ed736 100644 --- a/build/test/results/test_Stueckzeitakkort.pass +++ b/build/test/results/test_Stueckzeitakkort.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - '96600.000000' -:time: 0.0021118159997968178 +:time: 0.0014349960001709405 diff --git a/build/test/results/test_Vadd.pass b/build/test/results/test_Vadd.pass index 07ae2cb..36751d4 100644 --- a/build/test/results/test_Vadd.pass +++ b/build/test/results/test_Vadd.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0011882580001838505 +:time: 0.005964473999938491 diff --git a/build/test/results/test_Vaddx2.pass b/build/test/results/test_Vaddx2.pass index 51e1a89..341517b 100644 --- a/build/test/results/test_Vaddx2.pass +++ b/build/test/results/test_Vaddx2.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0017169859997920867 +:time: 0.001503902999957063 diff --git a/build/test/results/test_Vaddx3.pass b/build/test/results/test_Vaddx3.pass index 8a18414..bf2ef0a 100644 --- a/build/test/results/test_Vaddx3.pass +++ b/build/test/results/test_Vaddx3.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0011498449998725846 +:time: 0.0030279849997896235 diff --git a/build/test/results/test_Vlength.pass b/build/test/results/test_Vlength.pass index 221112e..992906a 100644 --- a/build/test/results/test_Vlength.pass +++ b/build/test/results/test_Vlength.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0013133669999660924 +:time: 0.001728690000163624 diff --git a/build/test/results/test_Vshift.pass b/build/test/results/test_Vshift.pass index 68d9be1..ec24e68 100644 --- a/build/test/results/test_Vshift.pass +++ b/build/test/results/test_Vshift.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.002090028000111488 +:time: 0.0011904409998351184 diff --git a/build/test/results/test_Vsubstract.pass b/build/test/results/test_Vsubstract.pass index 2e74cdc..0dc637a 100644 --- a/build/test/results/test_Vsubstract.pass +++ b/build/test/results/test_Vsubstract.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.00182502999996359 +:time: 0.0024045290001595276 diff --git a/build/test/results/test_Vsubstract2.pass b/build/test/results/test_Vsubstract2.pass index ba9846b..05ffb29 100644 --- a/build/test/results/test_Vsubstract2.pass +++ b/build/test/results/test_Vsubstract2.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0012332829996921646 +:time: 0.0012129009996897366 diff --git a/build/test/results/test_Vsubstract3.pass b/build/test/results/test_Vsubstract3.pass index b0f306a..8121c70 100644 --- a/build/test/results/test_Vsubstract3.pass +++ b/build/test/results/test_Vsubstract3.pass @@ -14,6 +14,5 @@ :passed: 1 :failed: 0 :ignored: 0 -:stdout: -- "(47.000000: " -:time: 0.004608971999914502 +:stdout: [] +:time: 0.0017049500002030982 diff --git a/build/test/results/test_Zeitlohn.pass b/build/test/results/test_Zeitlohn.pass index 612d1d7..ac59d92 100644 --- a/build/test/results/test_Zeitlohn.pass +++ b/build/test/results/test_Zeitlohn.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 3450.000000 -:time: 0.0016336050002792035 +:time: 0.002231616000244685 diff --git a/build/test/results/test_angebotserfolg.pass b/build/test/results/test_angebotserfolg.pass index 6fd4f8b..7c2cf0a 100644 --- a/build/test/results/test_angebotserfolg.pass +++ b/build/test/results/test_angebotserfolg.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 225.000000 -:time: 0.0014144070000838838 +:time: 0.002266382000016165 diff --git a/build/test/results/test_eigenkapital_Rentabilitaeten.pass b/build/test/results/test_eigenkapital_Rentabilitaeten.pass index 0e464dd..a93f5e7 100644 --- a/build/test/results/test_eigenkapital_Rentabilitaeten.pass +++ b/build/test/results/test_eigenkapital_Rentabilitaeten.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 62.500000 -:time: 0.001750366000123904 +:time: 0.003750263999791059 diff --git a/build/test/results/test_erloesfunktion.pass b/build/test/results/test_erloesfunktion.pass index a029b69..90693bd 100644 --- a/build/test/results/test_erloesfunktion.pass +++ b/build/test/results/test_erloesfunktion.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 4000.000000 -:time: 0.002237781000076211 +:time: 0.0012785750000148255 diff --git a/build/test/results/test_gesamtkapital_Rentabilitaeten.pass b/build/test/results/test_gesamtkapital_Rentabilitaeten.pass index 17fc104..1943bb1 100644 --- a/build/test/results/test_gesamtkapital_Rentabilitaeten.pass +++ b/build/test/results/test_gesamtkapital_Rentabilitaeten.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 27.136929 -:time: 0.002609437000046455 +:time: 0.005784590999610373 diff --git a/build/test/results/test_grenzGewinn.pass b/build/test/results/test_grenzGewinn.pass index 2453bdc..34cc4a2 100644 --- a/build/test/results/test_grenzGewinn.pass +++ b/build/test/results/test_grenzGewinn.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 1141.000000 -:time: 0.001293438999709906 +:time: 0.0013237190000836563 diff --git a/build/test/results/test_marktanteil.pass b/build/test/results/test_marktanteil.pass index e2a99cb..abd4065 100644 --- a/build/test/results/test_marktanteil.pass +++ b/build/test/results/test_marktanteil.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 21.739130 -:time: 0.005872603000170784 +:time: 0.004985405999832437 diff --git a/build/test/results/test_trapezFlaeche.pass b/build/test/results/test_trapezFlaeche.pass index 48aacd0..f6f4466 100644 --- a/build/test/results/test_trapezFlaeche.pass +++ b/build/test/results/test_trapezFlaeche.pass @@ -17,4 +17,4 @@ :stdout: - 'Flaeche vom Trapez betrÃĪgt: 21.000000' - Testergebniss 21.000000 -:time: 0.0012243179999131826 +:time: 0.0022571319996131933 diff --git a/src/funktion.c b/src/funktion.c index e1c1f3a..cbbc45b 100644 --- a/src/funktion.c +++ b/src/funktion.c @@ -153,9 +153,7 @@ float Vsubstract2(float x2, float z2) { double result = x2 - z2; return result; } -float Vsubstract3(float x3, float z3){ - float X3; - X3 = x3 - z3; - printf("(%f: \n",X3); - return X3; +float Vsubstract3(float x3, float z3) { + double result = x3 - z3; + return result; } diff --git a/src/main.c b/src/main.c index 9b79fb8..d88a015 100644 --- a/src/main.c +++ b/src/main.c @@ -129,9 +129,7 @@ int main() z2 = getValue('z'); Vsubstract2(x2, z2); - printf("z eingeben"); x3 = getValue('X'); - printf("c eingeben"); z3 = getValue('z'); Vsubstract3(x3, z3); }