Add more car dimensions, remove unused comments

diff --git a/bcar/src/bcar.cc b/bcar/src/bcar.cc
index 01f479cd722198e87183e21c69b6702999debf1e..a06aeef952755bd30df4efb87ea5cde16978102b 100644 (file)
--- a/bcar/src/bcar.cc
+++ b/bcar/src/bcar.cc
@@ -628,7 +628,7 @@ CarSize::become(std::string const what)
                this->df(this->wb() + 0.936);
                this->len(4.918);
                this->ft(1.680);
-       } else if (what == "chrysler pacifica") {
+       } else if (what == "chrysler pacifica" || what == "jhang2020") {
                this->ctc(9.557619159602458);
                this->wwm(2.297);
                this->w(2.022);
@@ -636,6 +636,22 @@ CarSize::become(std::string const what)
                this->df(4.236);
                this->len(5.171);
                this->ft(1.748);
+       } else if (what == "wang2017") {
+               this->ctc(8.411896337925237);
+               this->wwm(1.81);
+               this->w(1.81);
+               this->wb(2.7); // this is guess
+               this->df(3.7); // this is guess
+               this->len(4.85);
+               this->ft(1.6); // this is guess
+       } else if (what == "opel corsa") {
+               this->ctc(9.900);
+               this->wwm(1.944);
+               this->w(1.532);
+               this->wb(2.343);
+               this->df(3.212);
+               this->len(3.622);
+               this->ft(1.320);
        } else { // renault zoe
                this->ctc(10.802166641822163);
                this->wwm(1.945);

diff --git a/src/template-with-reset.cc b/src/template-with-reset.cc
index c3a825370138c2dafe10a8d9baf85ca09ba1b950..0d17b0603357028118236a2fb08fc304d18fba43 100644 (file)
--- a/src/template-with-reset.cc
+++ b/src/template-with-reset.cc
@@ -28,26 +28,6 @@ int main()
                jvi["slot"][2][0].asDouble(), jvi["slot"][2][1].asDouble(),
                jvi["slot"][3][0].asDouble(), jvi["slot"][3][1].asDouble());
        bcar::BicycleCar c;
-       // wang 2017
-       //c.ctc(8.411896337925237);
-       //c.w(1.81);
-       //c.wb(2.7);
-       //c.df(3.7);
-       //c.len(4.85);
-       // jhang 2020 https://en.wikipedia.org/wiki/Chrysler_Pacifica_(minivan)
-       //c.ctc(9.557619159602458);
-       //c.w(2.022);
-       //c.wb(3.089);
-       //c.df(4.236);
-       //c.len(5.171);
-       // feng 2018
-       //p.eta(0.1);
-       // PES Porsche Cayenne
-       //c.ctc(11.2531); // this is guess
-       //c.w(1.983);
-       //c.wb(2.895);
-       //c.df(2.895 + 0.9); // this is guess
-       //c.len(4.918);
        c.become("porsche cayenne");
 
        bool swapped = false;
@@ -96,34 +76,6 @@ int main()
        jvi["goal_inside"][1] = ispath.back().y();
        jvi["goal_inside"][2] = ispath.back().h();
 
-       // Opel Corsa
-       //p.bc().ctc(9.900);
-       //p.bc().w(1.532);
-       //p.bc().wb(2.343);
-       //p.bc().df(3.212);
-       //p.bc().len(3.622);
-       // wang 2017
-       //p.bc().ctc(8.411896337925237);
-       //p.bc().w(1.81);
-       //p.bc().wb(2.7);
-       //p.bc().df(3.7);
-       //p.bc().len(4.85);
-       // jhang 2020 https://en.wikipedia.org/wiki/Chrysler_Pacifica_(minivan)
-       //p.bc().ctc(9.557619159602458);
-       //p.bc().w(2.022);
-       //p.bc().wb(3.089);
-       //p.bc().df(4.236);
-       //p.bc().len(5.171);
-       //p.eta(0.3);
-       // feng 2018
-       //p.eta(0.1);
-       // PES Porsche Cayenne
-       //p.bc().ctc(11.2531); // this is guess
-       //p.bc().w(1.983);
-       //p.bc().wb(2.895);
-       //p.bc().df(2.895 + 0.9); // this is guess
-       //p.bc().len(4.918);
-       //p.eta(0.1);
        p.set_bc_to_become("porsche cayenne");
 
        p.json(jvi);