diff --git a/build/test/out/c/funktion.o b/build/test/out/c/funktion.o index d139c38..5690c6d 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 77e7332..444b076 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 82b7e51..de5890f 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 0b30596..df9e923 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 d421475..ba5de7a 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 f362594..009efc5 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 b559066..10f4d33 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 8f01a4b..caced6a 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 81d7ba9..e4cda45 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 1fe105e..712bb03 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 9377987..af6ceec 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 d70b8a4..586cc5b 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 6e8a182..0f0b902 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 86e64e6..e59c85e 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 1c0263a..aa92b59 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 f882792..797ae56 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 c69cef4..6cf10dd 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 a8024bf..2737294 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_Vmultiplier.out b/build/test/out/test_Vmultiplier.out index cab7d6b..94c9b44 100755 Binary files a/build/test/out/test_Vmultiplier.out and b/build/test/out/test_Vmultiplier.out differ diff --git a/build/test/out/test_Vshift.out b/build/test/out/test_Vshift.out index 2d615ba..4966b36 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 fa546e8..56c11a7 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 6a6121e..28a887f 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 fa4e2cc..7bf409b 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 c98e62c..63640e6 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 c937ec6..7280d38 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 bf203ed..da67a2d 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 4a47d56..ab78231 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 e0c5e80..626b46b 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 c883a37..3527021 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 d61a0de..346c387 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 e2cbb51..017ea0e 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 872a3f4..fee1278 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.0011546890000317944 +:time: 0.007183299999269366 diff --git a/build/test/results/test_Anlagenabnutzungsgrad.pass b/build/test/results/test_Anlagenabnutzungsgrad.pass index 39fbec4..31fffa0 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.004150048000155948 +:time: 0.0033103460000347695 diff --git a/build/test/results/test_Anlagenintensitaet.pass b/build/test/results/test_Anlagenintensitaet.pass index e184e75..e92d9e7 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.0022102869997979724 +:time: 0.0016961540004558628 diff --git a/build/test/results/test_Anlagenproduktivitaet.pass b/build/test/results/test_Anlagenproduktivitaet.pass index f82b209..97eda28 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.0018764860001283523 +:time: 0.0011991999999736436 diff --git a/build/test/results/test_Arbeitsproduktivitaet.pass b/build/test/results/test_Arbeitsproduktivitaet.pass index 80dd930..643dbe3 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.002347222000025795 +:time: 0.001657092000641569 diff --git a/build/test/results/test_Cashflow_zu_Gesamtkapital.pass b/build/test/results/test_Cashflow_zu_Gesamtkapital.pass index a5f6173..41fae2d 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.0013709830000152579 +:time: 0.002164624999750231 diff --git a/build/test/results/test_Dynamische_Amortisationszeit.pass b/build/test/results/test_Dynamische_Amortisationszeit.pass index 732f258..abc9795 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.0019218780003029678 +:time: 0.0016079430006357143 diff --git a/build/test/results/test_Effektivverzinsung.pass b/build/test/results/test_Effektivverzinsung.pass index 411aa25..3dc3051 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.005771901000116486 +:time: 0.001335736999863002 diff --git a/build/test/results/test_Finanzierungsregeln.pass b/build/test/results/test_Finanzierungsregeln.pass index 1dc3c81..1d048a1 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.0011937150002268027 +:time: 0.0012398809994920157 diff --git a/build/test/results/test_GewinnMaximum.pass b/build/test/results/test_GewinnMaximum.pass index 57c3cdc..3106a06 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.0026673659999687516 +:time: 0.0015268019997165538 diff --git a/build/test/results/test_Kalkulatorische_Zinsen.pass b/build/test/results/test_Kalkulatorische_Zinsen.pass index e7600f9..e134e55 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.0013107139998282946 +:time: 0.002399672000137798 diff --git a/build/test/results/test_Kritische_Menge.pass b/build/test/results/test_Kritische_Menge.pass index 058dbc8..6f46e66 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.0013885889998164203 +:time: 0.002411744000710314 diff --git a/build/test/results/test_Stueckzeitakkort.pass b/build/test/results/test_Stueckzeitakkort.pass index f8ac8a7..abfec97 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.001338163000127679 +:time: 0.001524582999991253 diff --git a/build/test/results/test_Vadd.pass b/build/test/results/test_Vadd.pass index 6945296..e536a68 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.0021597970003313094 +:time: 0.0011768570002459455 diff --git a/build/test/results/test_Vaddx2.pass b/build/test/results/test_Vaddx2.pass index f2bcb19..77b989b 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.005232475999946473 +:time: 0.00209341299978405 diff --git a/build/test/results/test_Vaddx3.pass b/build/test/results/test_Vaddx3.pass index 9fb200b..b0bbb3a 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.0013573030000770814 +:time: 0.0012140590006310958 diff --git a/build/test/results/test_Vlength.pass b/build/test/results/test_Vlength.pass index 99b1b87..f60a0ea 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.0026122079998458503 +:time: 0.0015386689992737956 diff --git a/build/test/results/test_Vmultiplier.pass b/build/test/results/test_Vmultiplier.pass index 101dc55..db96073 100644 --- a/build/test/results/test_Vmultiplier.pass +++ b/build/test/results/test_Vmultiplier.pass @@ -14,6 +14,5 @@ :passed: 1 :failed: 0 :ignored: 0 -:stdout: -- "(|20.000000" -:time: 0.0017549280000821454 +:stdout: [] +:time: 0.0012664989999393583 diff --git a/build/test/results/test_Vshift.pass b/build/test/results/test_Vshift.pass index 872018f..c2a867b 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.0012029929998789157 +:time: 0.00138040500041825 diff --git a/build/test/results/test_Vsubstract.pass b/build/test/results/test_Vsubstract.pass index a2517b0..9c5f777 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.0018299929997738218 +:time: 0.0014502859994536266 diff --git a/build/test/results/test_Vsubstract2.pass b/build/test/results/test_Vsubstract2.pass index f21fd3b..f72b7b6 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.0015046779999465798 +:time: 0.001272674000574625 diff --git a/build/test/results/test_Vsubstract3.pass b/build/test/results/test_Vsubstract3.pass index fc1f691..fe5234d 100644 --- a/build/test/results/test_Vsubstract3.pass +++ b/build/test/results/test_Vsubstract3.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0011397150001357659 +:time: 0.0027915660002690856 diff --git a/build/test/results/test_Zeitlohn.pass b/build/test/results/test_Zeitlohn.pass index 0d2d0d7..302aa3c 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.0018422560001454258 +:time: 0.002358335000280931 diff --git a/build/test/results/test_angebotserfolg.pass b/build/test/results/test_angebotserfolg.pass index dfcf974..fbd5852 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.0014194419995874341 +:time: 0.0012216840004839469 diff --git a/build/test/results/test_eigenkapital_Rentabilitaeten.pass b/build/test/results/test_eigenkapital_Rentabilitaeten.pass index 452a18a..674241e 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.004762472000038542 +:time: 0.0017686459996184567 diff --git a/build/test/results/test_erloesfunktion.pass b/build/test/results/test_erloesfunktion.pass index 6406193..ea9933c 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.0012321650001467788 +:time: 0.0017133679994003614 diff --git a/build/test/results/test_gesamtkapital_Rentabilitaeten.pass b/build/test/results/test_gesamtkapital_Rentabilitaeten.pass index a59fbaf..cc33dfb 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.0019845469996653264 +:time: 0.0012150149996159598 diff --git a/build/test/results/test_grenzGewinn.pass b/build/test/results/test_grenzGewinn.pass index 2c5e444..6a2e103 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.0011917510000785114 +:time: 0.0024163340003724443 diff --git a/build/test/results/test_marktanteil.pass b/build/test/results/test_marktanteil.pass index 43b3b66..5673cd6 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.001232652999988204 +:time: 0.0013112200003888574 diff --git a/build/test/results/test_trapezFlaeche.pass b/build/test/results/test_trapezFlaeche.pass index f380e04..48b3cd2 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.0017883519999486452 +:time: 0.0012035270001433673 diff --git a/src/funktion.c b/src/funktion.c index 96bc4db..bd5f2a7 100644 --- a/src/funktion.c +++ b/src/funktion.c @@ -158,7 +158,6 @@ float Vsubstract3(float x3, float z3) { return result; } float Vmultiplier(float x1,float m) { - x1 = x1 * m; - printf("(|%f",x1); - return x1; + double result = x1 * m; + return result; } diff --git a/src/main.c b/src/main.c index 3f88d2e..8dbd768 100644 --- a/src/main.c +++ b/src/main.c @@ -133,9 +133,7 @@ int main() z3 = getValue('z'); Vsubstract3(x3, z3); - printf("x eingeben"); x1 = getValue('X'); - printf("m eingeben"); m = getValue('M'); Vmultiplier(x1, m); }