Fix compile warnings

2022-11-13 18:17:21 +01:00
parent bfdee33a56
commit a004990fb4
2 changed files with 142 additions and 142 deletions
--- a/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp
+++ b/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp
@@ -1,27 +1,27 @@
 #include "Starters.hpp"

-Starters_c::Starters_c(MachineStandard Standard, unsigned int annualProductionMachine1,
-                       unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement)
+Starters_c::Starters_c(MachineStandard Standard, int64_t annualProductionMachine1,
+                       int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement)
    : Starters_c(Standard, 1, annualProductionMachine1, 0, 0, salesPrice, profitMarginShop, quality, advertisement)
 {
 }

-Starters_c::Starters_c(MachineStandard Standard, unsigned int annualProductionMachine1,
-                       unsigned int annualProductionMachine2,
-                       unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement)
+Starters_c::Starters_c(MachineStandard Standard, int64_t annualProductionMachine1,
+                       int64_t annualProductionMachine2,
+                       int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement)
    : Starters_c(Standard, 2, annualProductionMachine1, annualProductionMachine2, 0, salesPrice, profitMarginShop, quality, advertisement)
 {
 }
-Starters_c::Starters_c(MachineStandard Standard, unsigned int annualProductionMachine1,
-                       unsigned int annualProductionMachine2, unsigned int annualProductionMachine3,
-                       unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement)
+Starters_c::Starters_c(MachineStandard Standard, int64_t annualProductionMachine1,
+                       int64_t annualProductionMachine2, int64_t annualProductionMachine3,
+                       int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement)
    : Starters_c(Standard, 3, annualProductionMachine1, annualProductionMachine2, annualProductionMachine3, salesPrice, profitMarginShop, quality, advertisement)
 {
 }

-Starters_c::Starters_c(MachineStandard Standard, unsigned int NMachines, unsigned int annualProductionMachine1,
-                       unsigned int annualProductionMachine2, unsigned int annualProductionMachine3,
-                       unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement)
+Starters_c::Starters_c(MachineStandard Standard, int64_t NMachines, int64_t annualProductionMachine1,
+                       int64_t annualProductionMachine2, int64_t annualProductionMachine3,
+                       int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement)
 {
    if (checkInput(Standard, NMachines, annualProductionMachine1,
                   annualProductionMachine2, annualProductionMachine3, salesPrice,
@@ -42,9 +42,9 @@ Starters_c::Starters_c(MachineStandard Standard, unsigned int NMachines, unsigne
    this->B4 = advertisement;
 }

-bool Starters_c::checkInput(MachineStandard Standard, unsigned int NMachines, unsigned int annualProductionMachine1,
-                            unsigned int annualProductionMachine2, unsigned int annualProductionMachine3,
-                            unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement)
+bool Starters_c::checkInput(MachineStandard Standard, int64_t NMachines, int64_t annualProductionMachine1,
+                            int64_t annualProductionMachine2, int64_t annualProductionMachine3,
+                            int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement)
 {
    bool returnValue = true;
    if (Standard == MachineStandard::Standard)
@@ -131,7 +131,7 @@ void Starters_c::setStandard(MachineStandard Standard)
    this->Standard = Standard;
 }

-void Starters_c::setNMachines(unsigned int NMachines)
+void Starters_c::setNMachines(int64_t NMachines)
 {
    if (checkInput(Standard, NMachines, A2, A5, A8, B1, B2, B3, B4) == false)
    {
@@ -140,7 +140,7 @@ void Starters_c::setNMachines(unsigned int NMachines)
    this->A1 = NMachines;
 }

-void Starters_c::setAnualProductionMachine1(unsigned int annualProductionMachine1)
+void Starters_c::setAnualProductionMachine1(int64_t annualProductionMachine1)
 {
    if (checkInput(Standard, A1, annualProductionMachine1, A5, A8, B1, B2, B3, B4) == false)
    {
@@ -149,7 +149,7 @@ void Starters_c::setAnualProductionMachine1(unsigned int annualProductionMachine
    this->A2 = annualProductionMachine1;
 }

-void Starters_c::setAnualProductionMachine2(unsigned int annualProductionMachine2)
+void Starters_c::setAnualProductionMachine2(int64_t annualProductionMachine2)
 {
    if (checkInput(Standard, A1, A2, annualProductionMachine2, A8, B1, B2, B3, B4) == false)
    {
@@ -158,7 +158,7 @@ void Starters_c::setAnualProductionMachine2(unsigned int annualProductionMachine
    this->A5 = annualProductionMachine2;
 }

-void Starters_c::setAnualProductionMachine3(unsigned int annualProductionMachine3)
+void Starters_c::setAnualProductionMachine3(int64_t annualProductionMachine3)
 {
    if (checkInput(Standard, A1, A2, A5, annualProductionMachine3, B1, B2, B3, B4) == false)
    {
@@ -167,7 +167,7 @@ void Starters_c::setAnualProductionMachine3(unsigned int annualProductionMachine
    this->A8 = annualProductionMachine3;
 }

-void Starters_c::setSalesPrice(unsigned int salesPrice)
+void Starters_c::setSalesPrice(int64_t salesPrice)
 {
    if (checkInput(Standard, A1, A2, A5, A8, salesPrice, B2, B3, B4) == false)
    {
@@ -176,7 +176,7 @@ void Starters_c::setSalesPrice(unsigned int salesPrice)
    this->B1 = salesPrice;
 }

-void Starters_c::setProfitMarginShop(unsigned int profitMarginShop)
+void Starters_c::setProfitMarginShop(int64_t profitMarginShop)
 {
    if (checkInput(Standard, A1, A2, A5, A8, B1, profitMarginShop, B3, B4) == false)
    {
@@ -185,7 +185,7 @@ void Starters_c::setProfitMarginShop(unsigned int profitMarginShop)
    this->B2 = profitMarginShop;
 }

-void Starters_c::setQuality(unsigned int quality)
+void Starters_c::setQuality(int64_t quality)
 {
    if (checkInput(Standard, A1, A2, A5, A8, B1, B2, quality, B4) == false)
    {
@@ -194,7 +194,7 @@ void Starters_c::setQuality(unsigned int quality)
    this->B3 = quality;
 }

-void Starters_c::setAdvertisement(unsigned int advertisement)
+void Starters_c::setAdvertisement(int64_t advertisement)
 {
    if (checkInput(Standard, A1, A2, A5, A8, B1, B2, B3, advertisement) == false)
    {
@@ -208,62 +208,62 @@ Starters_c::MachineStandard Starters_c::getStandard(void) const
    return Standard;
 }

-unsigned int Starters_c::getNMachines(void) const
+int64_t Starters_c::getNMachines(void) const
 {
    return A1;
 }

-unsigned int Starters_c::getAnualProductionMachine1(void) const
+int64_t Starters_c::getAnualProductionMachine1(void) const
 {
    return A2;
 }

-unsigned int Starters_c::getAnualProductionMachine2(void) const
+int64_t Starters_c::getAnualProductionMachine2(void) const
 {
    return A5;
 }

-unsigned int Starters_c::getAnualProductionMachine3(void) const
+int64_t Starters_c::getAnualProductionMachine3(void) const
 {
    return A8;
 }

-unsigned int Starters_c::getSalesPrice(void) const
+int64_t Starters_c::getSalesPrice(void) const
 {
    return B1;
 }

-unsigned int Starters_c::getProfitMarginShop(void) const
+int64_t Starters_c::getProfitMarginShop(void) const
 {
    return B2;
 }

-unsigned int Starters_c::getQuality(void) const
+int64_t Starters_c::getQuality(void) const
 {
    return B3;
 }

-unsigned int Starters_c::getAdvertisement(void) const
+int64_t Starters_c::getAdvertisement(void) const
 {
    return B4;
 }

-float Starters_c::calculate()
+double Starters_c::calculate()
 {
    // A productie
    // Machine 1
    this->A3 = productionCost(this->Standard, this->A2);
-    this->A4 = this->A2 * this->A3;
+    this->A4 = (double)this->A2 * this->A3;
    // Machine 2
    this->A6 = productionCost(this->Standard, this->A5);
-    this->A7 = this->A5 * this->A6;
+    this->A7 = (double)this->A5 * this->A6;
    // Machine 3
    this->A9 = productionCost(this->Standard, this->A8);
-    this->A10 = this->A8 * this->A9;
+    this->A10 = (double)this->A8 * this->A9;
    // Totale productionCost
    this->A11 = this->A4 + this->A7 + this->A10;
    this->A12 = this->A2 + this->A5 + this->A8;
-    this->A13 = static_cast<float>(this->A11) / static_cast<float>(this->A12);
+    this->A13 = static_cast<double>(this->A11) / static_cast<double>(this->A12);

    // B marketing
    // ingevuld door constructor
@@ -286,16 +286,15 @@ float Starters_c::calculate()
    // D Resultaatberekeningen
    this->D1 = this->C7;
    this->D2 = this->B1;
-    this->D3 = this->D1 * this->D2;
-    this->D4 = this->D1 * this->A13;
-    this->D5 = this->D3 * this->B2 / 100;
-    this->D6 = this->D3 - this->D4 - this->D5;
-    this->D7 = this->B3;
-    this->D8 = this->B4;
-    if (Standard == MachineStandard::Standard)
-        this->D9 = this->A12 - this->C7;
-    else
-        this->D9 = 2 * (this->A12 - this->C7);
+    this->D3 = (double)this->D1 * (double)this->D2;
+    this->D4 = (double)this->D1 * (double)this->A13;
+    this->D5 = this->D3 * (double)this->B2 / 100.0;
+    this->D6 = this->D3 - (double)this->D4 - (double)this->D5;
+    this->D7 = (double)this->B3;
+    this->D8 = (double)this->B4;
+    this->D9 = (double)this->A12 - (double)this->C7;
+    if (Standard == MachineStandard::Luxe)
+        this->D9 *= 2;
    this->D10 = this->D6 - this->D7 - this->D8 - this->D9;
    
    return this->D10;
@@ -304,12 +303,12 @@ float Starters_c::calculate()
    return -1;
 }

-float Starters_c::getResult(void) const
+double Starters_c::getResult(void) const
 {
    return this->D10;
 }

-float Starters_c::productionCostLuxe(unsigned int productionQuantity)
+double Starters_c::productionCostLuxe(int64_t productionQuantity)
 {
    if (productionQuantity == 0)
        return 0;
@@ -352,7 +351,7 @@ float Starters_c::productionCostLuxe(unsigned int productionQuantity)
    return -1;
 }

-float Starters_c::productionCostStandard(unsigned int productionQuantity)
+double Starters_c::productionCostStandard(int64_t productionQuantity)
 {
    if (productionQuantity == 0)
        return 0;
@@ -395,7 +394,7 @@ float Starters_c::productionCostStandard(unsigned int productionQuantity)
    return -1;
 }

-float Starters_c::productionCost(Starters_c::MachineStandard Standard, unsigned int productionQuantity)
+double Starters_c::productionCost(Starters_c::MachineStandard Standard, int64_t productionQuantity)
 {
    switch (Standard)
    {
@@ -411,7 +410,7 @@ float Starters_c::productionCost(Starters_c::MachineStandard Standard, unsigned
    }
 }

-int Starters_c::AdditionalOrdersSalesPriceStandard(unsigned int salesPrice)
+int64_t Starters_c::AdditionalOrdersSalesPriceStandard(int64_t salesPrice)
 {
    if (salesPrice == 34)
        return 600;
@@ -440,7 +439,7 @@ int Starters_c::AdditionalOrdersSalesPriceStandard(unsigned int salesPrice)
    return -1;
 }

-int Starters_c::AdditionalOrdersSalesPriceLuxe(unsigned int salesPrice)
+int64_t Starters_c::AdditionalOrdersSalesPriceLuxe(int64_t salesPrice)
 {
    if (salesPrice == 95)
        return 10;
@@ -469,7 +468,7 @@ int Starters_c::AdditionalOrdersSalesPriceLuxe(unsigned int salesPrice)
    return -1;
 }

-int Starters_c::AdditionalOrdersSalesPrice(Starters_c::MachineStandard Standard, unsigned int salesPrice)
+int64_t Starters_c::AdditionalOrdersSalesPrice(Starters_c::MachineStandard Standard, int64_t salesPrice)
 {
    switch (Standard)
    {
@@ -485,7 +484,7 @@ int Starters_c::AdditionalOrdersSalesPrice(Starters_c::MachineStandard Standard,
    }
 }

-int Starters_c::AdditionalOrdersProfitMarginStandard(unsigned int profitMargin)
+int64_t Starters_c::AdditionalOrdersProfitMarginStandard(int64_t profitMargin)
 {
    if (profitMargin == 15)
        return 30;
@@ -511,7 +510,7 @@ int Starters_c::AdditionalOrdersProfitMarginStandard(unsigned int profitMargin)
    return -1;
 }

-int Starters_c::AdditionalOrdersProfitMarginLuxe(unsigned int profitMargin)
+int64_t Starters_c::AdditionalOrdersProfitMarginLuxe(int64_t profitMargin)
 {
    if (profitMargin == 25)
        return 375;
@@ -533,7 +532,7 @@ int Starters_c::AdditionalOrdersProfitMarginLuxe(unsigned int profitMargin)
    return -1;
 }

-int Starters_c::AdditionalOrdersProfitMargin(MachineStandard Standard, unsigned int profitMargin)
+int64_t Starters_c::AdditionalOrdersProfitMargin(MachineStandard Standard, int64_t profitMargin)
 {
    switch (Standard)
    {
@@ -549,7 +548,7 @@ int Starters_c::AdditionalOrdersProfitMargin(MachineStandard Standard, unsigned
    }
 }

-int Starters_c::AdditionalOrdersQualityStandard(unsigned int budgetQuality)
+int64_t Starters_c::AdditionalOrdersQualityStandard(int64_t budgetQuality)
 {
    if (budgetQuality == 3000)
        return 75;
@@ -575,7 +574,7 @@ int Starters_c::AdditionalOrdersQualityStandard(unsigned int budgetQuality)
    return -1;
 }

-int Starters_c::AdditionalOrdersQualityLuxe(unsigned int budgetQuality)
+int64_t Starters_c::AdditionalOrdersQualityLuxe(int64_t budgetQuality)
 {
    if (budgetQuality == 5000)
        return 500;
@@ -597,7 +596,7 @@ int Starters_c::AdditionalOrdersQualityLuxe(unsigned int budgetQuality)
    return -1;
 }

-int Starters_c::AdditionalOrdersQuality(MachineStandard Standard, unsigned int budgetQuality)
+int64_t Starters_c::AdditionalOrdersQuality(MachineStandard Standard, int64_t budgetQuality)
 {
    switch (Standard)
    {
@@ -613,7 +612,7 @@ int Starters_c::AdditionalOrdersQuality(MachineStandard Standard, unsigned int b
    }
 }

-int Starters_c::AdditionalOrdersadvertisementStandard(unsigned int budgetAdvertisement)
+int64_t Starters_c::AdditionalOrdersadvertisementStandard(int64_t budgetAdvertisement)
 {
    if (budgetAdvertisement == 25000)
        return 1500;
@@ -635,7 +634,7 @@ int Starters_c::AdditionalOrdersadvertisementStandard(unsigned int budgetAdverti
    return -1;
 }

-int Starters_c::AdditionalOrdersadvertisementLuxe(unsigned int budgetAdvertisement)
+int64_t Starters_c::AdditionalOrdersadvertisementLuxe(int64_t budgetAdvertisement)
 {
    if (budgetAdvertisement == 25000)
        return 375;
@@ -657,7 +656,7 @@ int Starters_c::AdditionalOrdersadvertisementLuxe(unsigned int budgetAdvertiseme
    return -1;
 }

-int Starters_c::AdditionalOrdersadvertisement(MachineStandard Standard, unsigned int budgetAdvertisement)
+int64_t Starters_c::AdditionalOrdersadvertisement(MachineStandard Standard, int64_t budgetAdvertisement)
 {
    switch (Standard)
    {
--- a/src/TopTeamBedrijfssimulaties/Starters/Starters.hpp
+++ b/src/TopTeamBedrijfssimulaties/Starters/Starters.hpp
@@ -2,6 +2,7 @@
 #include <algorithm>
 #include <functional>
 #include <ctime>
+#include <cstdint>

 #include "debug.hpp"

@@ -35,106 +36,106 @@ public:
        Standard,
        Luxe
    };
-    Starters_c(MachineStandard Standard, unsigned int annualProductionMachine1,
-               unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement);
+    Starters_c(MachineStandard Standard, int64_t annualProductionMachine1,
+               int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement);

-    Starters_c(MachineStandard Standard, unsigned int annualProductionMachine1, unsigned int annualProductionMachine2,
-               unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement);
+    Starters_c(MachineStandard Standard, int64_t annualProductionMachine1, int64_t annualProductionMachine2,
+               int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement);

-    Starters_c(MachineStandard Standard, unsigned int annualProductionMachine1,
-               unsigned int annualProductionMachine2, unsigned int annualProductionMachine3,
-               unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement);
+    Starters_c(MachineStandard Standard, int64_t annualProductionMachine1,
+               int64_t annualProductionMachine2, int64_t annualProductionMachine3,
+               int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement);

-    Starters_c(MachineStandard Standard, unsigned int NMachines, unsigned int annualProductionMachine1,
-               unsigned int annualProductionMachine2, unsigned int annualProductionMachine3,
-               unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement);
+    Starters_c(MachineStandard Standard, int64_t NMachines, int64_t annualProductionMachine1,
+               int64_t annualProductionMachine2, int64_t annualProductionMachine3,
+               int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement);

-    bool checkInput(MachineStandard Standard, unsigned int NMachines, unsigned int annualProductionMachine1,
-                    unsigned int annualProductionMachine2, unsigned int annualProductionMachine3,
-                    unsigned int salesPrice, unsigned int profitMarginShop, unsigned int quality, unsigned int advertisement);
+    bool checkInput(MachineStandard Standard, int64_t NMachines, int64_t annualProductionMachine1,
+                    int64_t annualProductionMachine2, int64_t annualProductionMachine3,
+                    int64_t salesPrice, int64_t profitMarginShop, int64_t quality, int64_t advertisement);

    void setStandard(MachineStandard Standard);
-    void setNMachines(unsigned int nMachines);
-    void setAnualProductionMachine1(unsigned int annualProductionMachine1);
-    void setAnualProductionMachine2(unsigned int annualProductionMachine2);
-    void setAnualProductionMachine3(unsigned int annualProductionMachine3);
-    void setSalesPrice(unsigned int salesPrice);
-    void setProfitMarginShop(unsigned int profitMarginShop);
-    void setQuality(unsigned int quality);
-    void setAdvertisement(unsigned int advertisement);
+    void setNMachines(int64_t nMachines);
+    void setAnualProductionMachine1(int64_t annualProductionMachine1);
+    void setAnualProductionMachine2(int64_t annualProductionMachine2);
+    void setAnualProductionMachine3(int64_t annualProductionMachine3);
+    void setSalesPrice(int64_t salesPrice);
+    void setProfitMarginShop(int64_t profitMarginShop);
+    void setQuality(int64_t quality);
+    void setAdvertisement(int64_t advertisement);

    MachineStandard getStandard(void) const;
-    unsigned int getNMachines(void) const;
-    unsigned int getAnualProductionMachine1(void) const;
-    unsigned int getAnualProductionMachine2(void) const;
-    unsigned int getAnualProductionMachine3(void) const;
-    unsigned int getSalesPrice(void) const;
-    unsigned int getProfitMarginShop(void) const;
-    unsigned int getQuality(void) const;
-    unsigned int getAdvertisement(void) const;
+    int64_t getNMachines(void) const;
+    int64_t getAnualProductionMachine1(void) const;
+    int64_t getAnualProductionMachine2(void) const;
+    int64_t getAnualProductionMachine3(void) const;
+    int64_t getSalesPrice(void) const;
+    int64_t getProfitMarginShop(void) const;
+    int64_t getQuality(void) const;
+    int64_t getAdvertisement(void) const;

-    float calculate();
-    float getResult() const;
+    double calculate();
+    double getResult() const;

 private:
 protected:
-    float productionCostStandard(unsigned int productionQuantity);
-    float productionCostLuxe(unsigned int productionQuantity);
-    float productionCost(MachineStandard Standard, unsigned int productionQuantity);
+    double productionCostStandard(int64_t productionQuantity);
+    double productionCostLuxe(int64_t productionQuantity);
+    double productionCost(MachineStandard Standard, int64_t productionQuantity);

-    int AdditionalOrdersSalesPriceStandard(unsigned int salesPrice);
-    int AdditionalOrdersSalesPriceLuxe(unsigned int salesPrice);
-    int AdditionalOrdersSalesPrice(MachineStandard Standard, unsigned int salesPrice);
+    int64_t AdditionalOrdersSalesPriceStandard(int64_t salesPrice);
+    int64_t AdditionalOrdersSalesPriceLuxe(int64_t salesPrice);
+    int64_t AdditionalOrdersSalesPrice(MachineStandard Standard, int64_t salesPrice);

-    int AdditionalOrdersProfitMarginStandard(unsigned int profitMargin);
-    int AdditionalOrdersProfitMarginLuxe(unsigned int profitMargin);
-    int AdditionalOrdersProfitMargin(MachineStandard Standard, unsigned int profitMargin);
+    int64_t AdditionalOrdersProfitMarginStandard(int64_t profitMargin);
+    int64_t AdditionalOrdersProfitMarginLuxe(int64_t profitMargin);
+    int64_t AdditionalOrdersProfitMargin(MachineStandard Standard, int64_t profitMargin);

-    int AdditionalOrdersQualityStandard(unsigned int budgetQuality);
-    int AdditionalOrdersQualityLuxe(unsigned int budgetQuality);
-    int AdditionalOrdersQuality(MachineStandard Standard, unsigned int budgetQuality);
+    int64_t AdditionalOrdersQualityStandard(int64_t budgetQuality);
+    int64_t AdditionalOrdersQualityLuxe(int64_t budgetQuality);
+    int64_t AdditionalOrdersQuality(MachineStandard Standard, int64_t budgetQuality);

-    int AdditionalOrdersadvertisementStandard(unsigned int budgetAdvertisement);
-    int AdditionalOrdersadvertisementLuxe(unsigned int budgetAdvertisement);
-    int AdditionalOrdersadvertisement(MachineStandard Standard, unsigned int budgetAdvertisement);
+    int64_t AdditionalOrdersadvertisementStandard(int64_t budgetAdvertisement);
+    int64_t AdditionalOrdersadvertisementLuxe(int64_t budgetAdvertisement);
+    int64_t AdditionalOrdersadvertisement(MachineStandard Standard, int64_t budgetAdvertisement);

    MachineStandard Standard;

-    int A1 = 0;
-    int A2 = 0;
-    int A3 = 0;
-    int A4 = 0;
-    int A5 = 0;
-    int A6 = 0;
-    int A7 = 0;
-    int A8 = 0;
-    int A9 = 0;
-    int A10 = 0;
-    int A11 = 0;
-    int A12 = 0;
-    float A13 = 0;
+    int64_t A1 = 0;
+    int64_t A2 = 0;
+    double A3 = 0;
+    double A4 = 0;
+    int64_t A5 = 0;
+    double A6 = 0;
+    double A7 = 0;
+    int64_t A8 = 0;
+    double A9 = 0;
+    double A10 = 0;
+    double A11 = 0;
+    int64_t A12 = 0;
+    double A13 = 0;

-    int B1 = 0;
-    int B2 = 0;
-    int B3 = 0;
-    int B4 = 0;
+    int64_t B1 = 0;
+    int64_t B2 = 0;
+    int64_t B3 = 0;
+    int64_t B4 = 0;

-    int C1 = 0;
-    int C2 = 0;
-    int C3 = 0;
-    int C4 = 0;
-    int C5 = 0;
-    int C6 = 0;
-    int C7 = 0;
+    int64_t C1 = 0;
+    int64_t C2 = 0;
+    int64_t C3 = 0;
+    int64_t C4 = 0;
+    int64_t C5 = 0;
+    int64_t C6 = 0;
+    int64_t C7 = 0;

-    int D1 = 0;
-    int D2 = 0;
-    int D3 = 0;
-    int D4 = 0;
-    float D5 = 0;
-    float D6 = 0;
-    int D7 = 0;
-    int D8 = 0;
-    int D9 = 0;
-    int D10 = 0;
+    int64_t D1 = 0;
+    int64_t D2 = 0;
+    double D3 = 0;
+    double D4 = 0;
+    double D5 = 0;
+    double D6 = 0;
+    double D7 = 0;
+    double D8 = 0;
+    double D9 = 0;
+    double D10 = 0;
 };