refactoring:Vmiddle2

2 years ago · 8def327c1a
73 changed files with 38 additions and 41 deletions
--- a/build/test/out/c/funktion.o
+++ b/build/test/out/c/funktion.o
--- a/build/test/out/test_Akkortrichtsatz.out
+++ b/build/test/out/test_Akkortrichtsatz.out
--- a/build/test/out/test_Anlagenabnutzungsgrad.out
+++ b/build/test/out/test_Anlagenabnutzungsgrad.out
--- a/build/test/out/test_Anlagenintensitaet.out
+++ b/build/test/out/test_Anlagenintensitaet.out
--- a/build/test/out/test_Anlagenproduktivitaet.out
+++ b/build/test/out/test_Anlagenproduktivitaet.out
--- a/build/test/out/test_Arbeitsproduktivitaet.out
+++ b/build/test/out/test_Arbeitsproduktivitaet.out
--- a/build/test/out/test_Cashflow_zu_Gesamtkapital.out
+++ b/build/test/out/test_Cashflow_zu_Gesamtkapital.out
--- a/build/test/out/test_Dynamische_Amortisationszeit.out
+++ b/build/test/out/test_Dynamische_Amortisationszeit.out
--- a/build/test/out/test_Effektivverzinsung.out
+++ b/build/test/out/test_Effektivverzinsung.out
--- a/build/test/out/test_Finanzierungsregeln.out
+++ b/build/test/out/test_Finanzierungsregeln.out
--- a/build/test/out/test_GewinnMaximum.out
+++ b/build/test/out/test_GewinnMaximum.out
--- a/build/test/out/test_Kalkulatorische_Zinsen.out
+++ b/build/test/out/test_Kalkulatorische_Zinsen.out
--- a/build/test/out/test_Kritische_Menge.out
+++ b/build/test/out/test_Kritische_Menge.out
--- a/build/test/out/test_Stueckzeitakkort.out
+++ b/build/test/out/test_Stueckzeitakkort.out
--- a/build/test/out/test_Vadd.out
+++ b/build/test/out/test_Vadd.out
--- a/build/test/out/test_Vaddx2.out
+++ b/build/test/out/test_Vaddx2.out
--- a/build/test/out/test_Vaddx3.out
+++ b/build/test/out/test_Vaddx3.out
--- a/build/test/out/test_Vlength.out
+++ b/build/test/out/test_Vlength.out
--- a/build/test/out/test_Vmiddle.out
+++ b/build/test/out/test_Vmiddle.out
--- a/build/test/out/test_Vmiddle2.out
+++ b/build/test/out/test_Vmiddle2.out
--- a/build/test/out/test_Vmultiplier.out
+++ b/build/test/out/test_Vmultiplier.out
--- a/build/test/out/test_Vmultiplier2.out
+++ b/build/test/out/test_Vmultiplier2.out
--- a/build/test/out/test_Vmultiplier3.out
+++ b/build/test/out/test_Vmultiplier3.out
--- a/build/test/out/test_Vparallel.out
+++ b/build/test/out/test_Vparallel.out
--- a/build/test/out/test_Vshift.out
+++ b/build/test/out/test_Vshift.out
--- a/build/test/out/test_Vsubstract.out
+++ b/build/test/out/test_Vsubstract.out
--- a/build/test/out/test_Vsubstract2.out
+++ b/build/test/out/test_Vsubstract2.out
--- a/build/test/out/test_Vsubstract3.out
+++ b/build/test/out/test_Vsubstract3.out
--- a/build/test/out/test_Zeitlohn.out
+++ b/build/test/out/test_Zeitlohn.out
--- a/build/test/out/test_angebotserfolg.out
+++ b/build/test/out/test_angebotserfolg.out
--- a/build/test/out/test_eigenkapital_Rentabilitaeten.out
+++ b/build/test/out/test_eigenkapital_Rentabilitaeten.out
--- a/build/test/out/test_erloesfunktion.out
+++ b/build/test/out/test_erloesfunktion.out
--- a/build/test/out/test_gesamtkapital_Rentabilitaeten.out
+++ b/build/test/out/test_gesamtkapital_Rentabilitaeten.out
--- a/build/test/out/test_grenzGewinn.out
+++ b/build/test/out/test_grenzGewinn.out
--- a/build/test/out/test_marktanteil.out
+++ b/build/test/out/test_marktanteil.out
--- a/build/test/out/test_trapezFlaeche.out
+++ b/build/test/out/test_trapezFlaeche.out
--- 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.0017314470005658222
 :time: 0.0017328330004602321
--- 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.0014881320003041765
 :time: 0.006140577999758534
--- 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.002773400000478432
 :time: 0.0025134480001725024
--- 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.002147223999600101
 :time: 0.002877918000194768
--- 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.0020234160001564305
 :time: 0.008499601000039547
--- 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.002072707000479568
 :time: 0.0017325250000794767
--- 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.0022117200005595805
 :time: 0.008665354000186198
--- 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.006845533999694453
 :time: 0.0031762980006533326
--- 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.006796829000450089
 :time: 0.0016555379997953423
--- 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.0016831200000524404
 :time: 0.004093991999980062
--- 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.001935133000188216
 :time: 0.0018228010003440431
--- 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.002501054000276781
 :time: 0.002207948999966902
--- 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.0013919939992774744
 :time: 0.0024240040002041496
--- 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.004898690000118222
 :time: 0.00428303200078517
--- 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.001306823000049917
 :time: 0.001765105000231415
--- 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.0012867899995399057
 :time: 0.0017510610005047056
--- 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.002495374999853084
 :time: 0.005587866000496433
--- a/build/test/results/test_Vmiddle.pass
+++ b/build/test/results/test_Vmiddle.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
 :time: 0.005504810999809706
 :time: 0.001660205999542086
--- a/build/test/results/test_Vmiddle2.pass
+++ b/build/test/results/test_Vmiddle2.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
 :time: 0.0075450300000738935
 :time: 0.0019753160004256642
--- 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.002419198999632499
 :time: 0.0013233430008767755
--- 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.0017313619991909945
 :time: 0.0014715710003656568
--- 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.0020859090000158176
 :time: 0.0017002610002236906
--- a/build/test/results/test_Vparallel.pass
+++ b/build/test/results/test_Vparallel.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
 :time: 0.0018662189995666267
 :time: 0.004189305999716453
--- 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.0015334559993789298
 :time: 0.004562609999993583
--- 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.002326619999621471
 :time: 0.0015104370004337397
--- 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.005454393999571039
 :time: 0.0017144960002042353
--- 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.0017736739991960349
 :time: 0.0020922379999319674
--- 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.001323896999565477
 :time: 0.0033085079994634725
--- 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.005426359000011871
 :time: 0.0014865550001559313
--- 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.0034705970001596143
 :time: 0.002103877000081411
--- 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.0026744320002762834
 :time: 0.0016521990000910591
--- 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.001988664000236895
 :time: 0.0035017109994441853
--- 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.0016964430005828035
 :time: 0.002711019000344095
--- 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.0018845140002667904
 :time: 0.0022752230006517493
--- 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.001766296000823786
 :time: 0.001729229999909876
--- a/src/funktion.c
+++ b/src/funktion.c
@ -207,8 +207,7 @@ float Vmiddle(float x1, float z1) {
    return result;
 }
 float Vmiddle2(float x2,float z2) {
    x2 = x2 + z2;
    printf("%f", x2 * 0.5);
    x2 = x2 * 0.5;
    return x2;
    double result = x2 + z2;
    result = result * 0.5;
    return result;
 }
--- a/src/main.c
+++ b/src/main.c
@ -157,9 +157,7 @@ int main()
    z1 = getValue('Z');
    Vmiddle(x1, z1);
    printf("y eingeben ");
    x2 = getValue('X');
    printf("b eingeben ");
    z2 = getValue('Z');
    Vmiddle2(x2, z2);