refactory:probability_from_tree

2 years ago · 7f4e855dcb
83 changed files with 41 additions and 44 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_Vangle.out
+++ b/build/test/out/test_Vangle.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_Vmiddle3.out
+++ b/build/test/out/test_Vmiddle3.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_Vskalort.out
+++ b/build/test/out/test_Vskalort.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_probability_from_tree.out
+++ b/build/test/out/test_probability_from_tree.out
--- a/build/test/out/test_trapezFlaeche.out
+++ b/build/test/out/test_trapezFlaeche.out
--- a/build/test/out/test_vPunkt.out
+++ b/build/test/out/test_vPunkt.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.007866255999033456
+:time: 0.0021576819999609143
--- 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.004099502999451943
+:time: 0.003508665999106597
--- 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.002544674000091618
+:time: 0.002917410000009113
--- 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.0017637499986449257
+:time: 0.005943973999819718
--- 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.0033360410016030073
+:time: 0.0016179200010810746
--- 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.00272540199875948
+:time: 0.0013433690000965726
--- 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.0017185569995490368
+:time: 0.0013859850005246699
--- 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.0016871799998625647
+:time: 0.0021734720012318576
--- 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.002001824999751989
+:time: 0.0017803640002966858
--- 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.001410099999702652
+:time: 0.0022076269997342024
--- 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.003338993999932427
+:time: 0.006400242999006878
--- 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.0018501929989724886
+:time: 0.002303446000951226
--- 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.0015410480009450112
+:time: 0.002429381000183639
--- 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.0018041010007436853
+:time: 0.0013770579989795806
--- 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.002057634999800939
+:time: 0.001445219999368419
--- 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.0021860500000911998
+:time: 0.002078814000924467
--- a/build/test/results/test_Vangle.pass
+++ b/build/test/results/test_Vangle.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.0037403749993245583
+:time: 0.0033905760010384256
--- 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.0016802390000520973
+:time: 0.002578505000201403
--- 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.004738868999993429
+:time: 0.00277927500064834
--- 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.004648265001378604
+:time: 0.0034392329998809146
--- a/build/test/results/test_Vmiddle3.pass
+++ b/build/test/results/test_Vmiddle3.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.0018271660010213964
+:time: 0.007561193999208626
--- 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.0018927809996966971
+:time: 0.002655837999554933
--- 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.001803843999368837
+:time: 0.001532724998469348
--- 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.0012804279995179968
+:time: 0.0017408980002073804
--- 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.0024604820009699324
+:time: 0.003320322999570635
--- 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.0018329430004087044
+:time: 0.001449869001589832
--- a/build/test/results/test_Vskalort.pass
+++ b/build/test/results/test_Vskalort.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.002142957999240025
+:time: 0.0018154090012103552
--- 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.0015674200003559235
+:time: 0.0022959180005273083
--- 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.0016028030004235916
+:time: 0.002155036001568078
--- 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.002439313000650145
+:time: 0.0029436249988066265
--- 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.0021390590009104926
+:time: 0.0017063979994418332
--- 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.002358757999900263
+:time: 0.0014974500008975156
--- 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.001762895000865683
+:time: 0.0024017040013859514
--- 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.0013848620001226664
+:time: 0.0023601699995197123
--- 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.0018161459993280005
+:time: 0.0015163669995672535
--- 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.001778494999598479
+:time: 0.0013913610000599874
--- 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.0032300359998771455
+:time: 0.0018299700004718034
--- a/build/test/results/test_probability_from_tree.pass
+++ b/build/test/results/test_probability_from_tree.pass
@ -14,6 +14,5 @@
  :passed: 1
  :failed: 0
  :ignored: 0
-:stdout:
- 'The probability is: 0.050000'
-:time: 0.001313610999204684
+:stdout: []
+:time: 0.002275183998790453
--- 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.002092060998620582
+:time: 0.0018528749988035997
--- a/build/test/results/test_vPunkt.pass
+++ b/build/test/results/test_vPunkt.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.002123493999533821
+:time: 0.0023238069989020005
--- a/src/funktion.c
+++ b/src/funktion.c
@ -251,6 +251,5 @@ float vPunkt(float x1, float x2, float x3, float z1, float z2, float z3, float p
 double probability_from_tree(double successful_outcomes, double total_outcomes, double branches) {
    double result;
    result = successful_outcomes / (total_outcomes * branches);
-    printf("The probability is: %lf\n", result);
    return result;
 }
--- a/src/main.c
+++ b/src/main.c
@ -196,7 +196,6 @@ int main()
    p3 = getValue('P');
    vPunkt(x1,x2,x3,z1,z2,z3,p1,p2,p3);

-    printf("Enter the number of successful outcomes, total outcomes, and number of branches: ");
    x = getValue('S');
    y = getValue('T');
    z = getValue('B');