diff --git a/build/test/out/c/funktion.o b/build/test/out/c/funktion.o index 9ef7db9..df5e9a1 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 790ed92..df09374 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 329367c..f96859c 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 838acab..80243a1 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 6ecf83b..28ee22b 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 cad879f..982d663 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 3f82229..711f119 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 873d0b1..2ea7bdc 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 4d444c5..2015b6f 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 79b82d9..e81450e 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 0f5c900..4bec0c8 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 607c4b9..2d94df3 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 bb33faa..a577478 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 492eb5b..e8ce909 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 877c822..9b02007 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 964c828..451a0ef 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 b83f075..7e5c901 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 cb93d11..112d052 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 9b4d218..23d7d7f 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_Zeitlohn.out b/build/test/out/test_Zeitlohn.out index 5c0dc08..0cf345a 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 ef7f98d..18c5436 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 98b22c0..42266c2 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 4d24e32..919c81d 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 4cbd388..afeb545 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 33178e1..f9de6e4 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 5606277..3966393 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 f8b4485..37e6ad8 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 c2fb9ad..0d10c35 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.0015105600000424602 +:time: 0.0010892499999499705 diff --git a/build/test/results/test_Anlagenabnutzungsgrad.pass b/build/test/results/test_Anlagenabnutzungsgrad.pass index 20b7a3e..8e8e639 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.0021977359997435997 +:time: 0.0015246739999383863 diff --git a/build/test/results/test_Anlagenintensitaet.pass b/build/test/results/test_Anlagenintensitaet.pass index 96964cb..3778a12 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.0012486400000852882 +:time: 0.004912790000162204 diff --git a/build/test/results/test_Anlagenproduktivitaet.pass b/build/test/results/test_Anlagenproduktivitaet.pass index f6b44a8..c529228 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.001393004999954428 +:time: 0.0019584779997785517 diff --git a/build/test/results/test_Arbeitsproduktivitaet.pass b/build/test/results/test_Arbeitsproduktivitaet.pass index 5433bb0..6b217df 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.005151992999799404 +:time: 0.003153232999920874 diff --git a/build/test/results/test_Cashflow_zu_Gesamtkapital.pass b/build/test/results/test_Cashflow_zu_Gesamtkapital.pass index dfa8bb4..700edf0 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.0018675989999792364 +:time: 0.0012962870000592375 diff --git a/build/test/results/test_Dynamische_Amortisationszeit.pass b/build/test/results/test_Dynamische_Amortisationszeit.pass index 6d1d007..8ebbdfb 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.0017505230002825556 +:time: 0.0015471010001419927 diff --git a/build/test/results/test_Effektivverzinsung.pass b/build/test/results/test_Effektivverzinsung.pass index dfcd13d..0e32e4e 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.0015386449999823526 +:time: 0.0016315079997184512 diff --git a/build/test/results/test_Finanzierungsregeln.pass b/build/test/results/test_Finanzierungsregeln.pass index 463ff66..c45530c 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.0011838810000881494 +:time: 0.0016992800001389696 diff --git a/build/test/results/test_GewinnMaximum.pass b/build/test/results/test_GewinnMaximum.pass index 3f2f72f..73bfc31 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.001489155000399478 +:time: 0.0022883710003043234 diff --git a/build/test/results/test_Kalkulatorische_Zinsen.pass b/build/test/results/test_Kalkulatorische_Zinsen.pass index 9599095..f1eba6c 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.0014590010000574694 +:time: 0.003428260999953636 diff --git a/build/test/results/test_Kritische_Menge.pass b/build/test/results/test_Kritische_Menge.pass index 77ac5e8..5068103 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.0013128229998073948 +:time: 0.002277903000049264 diff --git a/build/test/results/test_Stueckzeitakkort.pass b/build/test/results/test_Stueckzeitakkort.pass index 40fbc21..f60f18e 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.00123080100001971 +:time: 0.0044668549999187235 diff --git a/build/test/results/test_Vadd.pass b/build/test/results/test_Vadd.pass index 54cc5b2..99515a4 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.001180382000256941 +:time: 0.0013063500000498607 diff --git a/build/test/results/test_Vaddx2.pass b/build/test/results/test_Vaddx2.pass index 54c7ed3..ba44eb7 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.0013674269998773525 +:time: 0.001610672000424529 diff --git a/build/test/results/test_Vaddx3.pass b/build/test/results/test_Vaddx3.pass index 69d2195..976837d 100644 --- a/build/test/results/test_Vaddx3.pass +++ b/build/test/results/test_Vaddx3.pass @@ -14,6 +14,5 @@ :passed: 1 :failed: 0 :ignored: 0 -:stdout: -- "(3.000000: " -:time: 0.0034632850001798943 +:stdout: [] +:time: 0.0018272040001647838 diff --git a/build/test/results/test_Vlength.pass b/build/test/results/test_Vlength.pass index 4a76cec..e013b8f 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.001400958999965951 +:time: 0.002185852999900817 diff --git a/build/test/results/test_Vshift.pass b/build/test/results/test_Vshift.pass index 9c3280b..c09dc27 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.0017477700002928032 +:time: 0.0051865289997294894 diff --git a/build/test/results/test_Zeitlohn.pass b/build/test/results/test_Zeitlohn.pass index 7bbb934..3ba8620 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.0013304839999364049 +:time: 0.002940536000096472 diff --git a/build/test/results/test_angebotserfolg.pass b/build/test/results/test_angebotserfolg.pass index ce9070f..2055d57 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.001290804999825923 +:time: 0.0018840409998119867 diff --git a/build/test/results/test_eigenkapital_Rentabilitaeten.pass b/build/test/results/test_eigenkapital_Rentabilitaeten.pass index 13e3fc1..6f1c2e7 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.0017628589998821553 +:time: 0.00125848399966344 diff --git a/build/test/results/test_erloesfunktion.pass b/build/test/results/test_erloesfunktion.pass index 8ccb388..3957df9 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.003662498000267078 +:time: 0.0012494999996306433 diff --git a/build/test/results/test_gesamtkapital_Rentabilitaeten.pass b/build/test/results/test_gesamtkapital_Rentabilitaeten.pass index 1d65980..c08a4e3 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.0011836859998766158 +:time: 0.002011271999890596 diff --git a/build/test/results/test_grenzGewinn.pass b/build/test/results/test_grenzGewinn.pass index 5093766..7353e7a 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.001459978000184492 +:time: 0.0013196279996918747 diff --git a/build/test/results/test_marktanteil.pass b/build/test/results/test_marktanteil.pass index d38aa56..18475d2 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.0016021070000533655 +:time: 0.002347449000353663 diff --git a/build/test/results/test_trapezFlaeche.pass b/build/test/results/test_trapezFlaeche.pass index 57af8e8..1198d75 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.0012615010000445182 +:time: 0.00203405100000964 diff --git a/src/funktion.c b/src/funktion.c index 0689f64..35dcbca 100644 --- a/src/funktion.c +++ b/src/funktion.c @@ -142,8 +142,6 @@ float Vaddx2(float x2, float z2){ return result; } float Vaddx3(float x3, float z3){ - float X3; - X3 = x3 + z3; - printf("(%f: \n",X3); - return X3; + double result = x3 + z3; + return result; } diff --git a/src/main.c b/src/main.c index a55e3f5..8c47725 100644 --- a/src/main.c +++ b/src/main.c @@ -117,9 +117,7 @@ int main() z2 = getValue('z'); Vaddx2(x2,z2); - printf("z eingeben"); x3 = getValue('X'); - printf("c eingeben"); z3 = getValue('z'); Vaddx3(x3,z3); }