diff --git a/build/test/out/c/funktion.o b/build/test/out/c/funktion.o index df7a524..dfced56 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 0c88d58..dfdcc6b 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 97f3f42..fc63955 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 fca40d6..ffa8954 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 3eca2bb..76a1b46 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 5ce7200..5e8773e 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 06a6727..f1714aa 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 3d61386..53e04ad 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 5d4af66..79c28b2 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 1126a7f..6dcda34 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 5ac5c47..6108b91 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 933fc01..7fb4633 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 4f929f0..0c8df08 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 a025c81..915e17f 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 182b10f..8541f1a 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 9e5808a..5494b0f 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 386170c..8ec0f06 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 590d490..b4fc07c 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 3112d1e..39a2914 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_Vmultiplier2.out b/build/test/out/test_Vmultiplier2.out index 773930e..e579c15 100755 Binary files a/build/test/out/test_Vmultiplier2.out and b/build/test/out/test_Vmultiplier2.out differ diff --git a/build/test/out/test_Vmultiplier3.out b/build/test/out/test_Vmultiplier3.out index 60fb84b..d646d07 100755 Binary files a/build/test/out/test_Vmultiplier3.out and b/build/test/out/test_Vmultiplier3.out differ diff --git a/build/test/out/test_Vshift.out b/build/test/out/test_Vshift.out index 70b85a0..a059f4d 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 e275971..5fd776a 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 37add6f..c177f20 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 f621a39..a1db4a3 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 35b478e..e386039 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 1ffdbfe..f8ef443 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 8d8d375..4aade6e 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 3e1f886..51759cb 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 ffb8e2d..0cf9b54 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 fa28ae5..6a6cf21 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 1b8a199..9c4a9e5 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 7dcfbe7..b9fe08c 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 b20be52..09bbd06 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.0012911559997519362 +:time: 0.0016890700007934356 diff --git a/build/test/results/test_Anlagenabnutzungsgrad.pass b/build/test/results/test_Anlagenabnutzungsgrad.pass index 08bf4c3..f850f33 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.0019098560005659238 +:time: 0.0015604999998686253 diff --git a/build/test/results/test_Anlagenintensitaet.pass b/build/test/results/test_Anlagenintensitaet.pass index 7e7b005..fc8450d 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.0014726829995197477 +:time: 0.0012162999992142431 diff --git a/build/test/results/test_Anlagenproduktivitaet.pass b/build/test/results/test_Anlagenproduktivitaet.pass index defdb8b..97142ed 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.0019224850002501626 +:time: 0.0012468559998524142 diff --git a/build/test/results/test_Arbeitsproduktivitaet.pass b/build/test/results/test_Arbeitsproduktivitaet.pass index 273e96f..f662aee 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.0012818659997719806 +:time: 0.001287804999265063 diff --git a/build/test/results/test_Cashflow_zu_Gesamtkapital.pass b/build/test/results/test_Cashflow_zu_Gesamtkapital.pass index bf631be..f61a4ff 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.0020142470002610935 +:time: 0.0013746519998676376 diff --git a/build/test/results/test_Dynamische_Amortisationszeit.pass b/build/test/results/test_Dynamische_Amortisationszeit.pass index 86996ea..5290f46 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.0013134310001987615 +:time: 0.0011843600004795007 diff --git a/build/test/results/test_Effektivverzinsung.pass b/build/test/results/test_Effektivverzinsung.pass index 22a5eed..cafe642 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.0017611009998290683 +:time: 0.0014828899993517553 diff --git a/build/test/results/test_Finanzierungsregeln.pass b/build/test/results/test_Finanzierungsregeln.pass index 54b1097..dc1f11a 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.0013928930002293782 +:time: 0.0020255160006854567 diff --git a/build/test/results/test_GewinnMaximum.pass b/build/test/results/test_GewinnMaximum.pass index 7ef191e..0c51402 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.001308646999859775 +:time: 0.004688638000516221 diff --git a/build/test/results/test_Kalkulatorische_Zinsen.pass b/build/test/results/test_Kalkulatorische_Zinsen.pass index 0f118c5..b8997ed 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.0013207410001996323 +:time: 0.0019926570003008237 diff --git a/build/test/results/test_Kritische_Menge.pass b/build/test/results/test_Kritische_Menge.pass index 800b1f9..a916c9a 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.0014193870001690811 +:time: 0.001440089999960037 diff --git a/build/test/results/test_Stueckzeitakkort.pass b/build/test/results/test_Stueckzeitakkort.pass index 075ce9a..ce8cbb0 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.0018349600004512467 +:time: 0.0012750730002153432 diff --git a/build/test/results/test_Vadd.pass b/build/test/results/test_Vadd.pass index 5e4666e..9d811fe 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.0012119709999751649 +:time: 0.0019428570003583445 diff --git a/build/test/results/test_Vaddx2.pass b/build/test/results/test_Vaddx2.pass index d8c0c1f..98864a1 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.0012681789994530845 +:time: 0.002937556000688346 diff --git a/build/test/results/test_Vaddx3.pass b/build/test/results/test_Vaddx3.pass index 97c6197..fcb3b19 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.001238550999914878 +:time: 0.0011702379997586831 diff --git a/build/test/results/test_Vlength.pass b/build/test/results/test_Vlength.pass index 55af71c..fb5a8b5 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.0014226309995137854 +:time: 0.0016147529995578225 diff --git a/build/test/results/test_Vmultiplier.pass b/build/test/results/test_Vmultiplier.pass index e891cd2..9e1b7d5 100644 --- a/build/test/results/test_Vmultiplier.pass +++ b/build/test/results/test_Vmultiplier.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0012370129998089396 +:time: 0.0013668090005012346 diff --git a/build/test/results/test_Vmultiplier2.pass b/build/test/results/test_Vmultiplier2.pass index 5ec1281..f16d392 100644 --- a/build/test/results/test_Vmultiplier2.pass +++ b/build/test/results/test_Vmultiplier2.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0013486049992934568 +:time: 0.00155162300052325 diff --git a/build/test/results/test_Vmultiplier3.pass b/build/test/results/test_Vmultiplier3.pass index b5cec32..1d98a96 100644 --- a/build/test/results/test_Vmultiplier3.pass +++ b/build/test/results/test_Vmultiplier3.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.002879390000089188 +:time: 0.001541782999993302 diff --git a/build/test/results/test_Vshift.pass b/build/test/results/test_Vshift.pass index d102bed..038425f 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.0013579579999714042 +:time: 0.0020277769999665907 diff --git a/build/test/results/test_Vsubstract.pass b/build/test/results/test_Vsubstract.pass index b6ae117..ee04ac0 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.0011991490000582417 +:time: 0.0015898250003374415 diff --git a/build/test/results/test_Vsubstract2.pass b/build/test/results/test_Vsubstract2.pass index 860e7d2..a6060e8 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.0012789960001100553 +:time: 0.001201855000545038 diff --git a/build/test/results/test_Vsubstract3.pass b/build/test/results/test_Vsubstract3.pass index bff2b1c..f57f3ba 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.0012410979998094263 +:time: 0.0017088960003093234 diff --git a/build/test/results/test_Zeitlohn.pass b/build/test/results/test_Zeitlohn.pass index 0fef995..1838a8c 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.0013285459999679006 +:time: 0.001188326000374218 diff --git a/build/test/results/test_angebotserfolg.pass b/build/test/results/test_angebotserfolg.pass index a80faca..c2130b2 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.0013338449998627766 +:time: 0.0014427030000661034 diff --git a/build/test/results/test_eigenkapital_Rentabilitaeten.pass b/build/test/results/test_eigenkapital_Rentabilitaeten.pass index b7bb0db..263e222 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.001282696000089345 +:time: 0.002445236000312434 diff --git a/build/test/results/test_erloesfunktion.pass b/build/test/results/test_erloesfunktion.pass index ce81d5f..31504aa 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.0019819210001514875 +:time: 0.0014232940002329997 diff --git a/build/test/results/test_gesamtkapital_Rentabilitaeten.pass b/build/test/results/test_gesamtkapital_Rentabilitaeten.pass index 3c57c37..a677f20 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.0019890120001946343 +:time: 0.001533552999717358 diff --git a/build/test/results/test_grenzGewinn.pass b/build/test/results/test_grenzGewinn.pass index 1d33f52..f3f9f00 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.0012248909997651936 +:time: 0.0013601000000562635 diff --git a/build/test/results/test_marktanteil.pass b/build/test/results/test_marktanteil.pass index 776f5dd..1082b38 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.0013815669999530655 +:time: 0.0011345820003043627 diff --git a/build/test/results/test_trapezFlaeche.pass b/build/test/results/test_trapezFlaeche.pass index 0e0febc..a6a1853 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.002979441999741539 +:time: 0.001296557999921788 diff --git a/src/funktion.c b/src/funktion.c index d080965..471a731 100644 --- a/src/funktion.c +++ b/src/funktion.c @@ -166,7 +166,6 @@ float Vmultiplier2(float x2,float m) { return result; } float Vmultiplier3(float x3,float m) { - x3 = x3 * m; - printf("%f|)\n\n",x3); - return x3; + double result = x3 * m; + return result; } diff --git a/src/main.c b/src/main.c index 6ca8244..516598c 100644 --- a/src/main.c +++ b/src/main.c @@ -141,10 +141,7 @@ int main() m = getValue('M'); Vmultiplier2(x2, m); - printf("z eingeben"); x3 = getValue('X'); - printf("Vervielfachung\n\n"); - printf("m eingeben"); m = getValue('M'); Vmultiplier3(x3, m);