Keep track of real speed separately for each speed step

Base the slow speed on real speed instead of a fixed speed step

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index d7b422039ea71e43b740f619a59c33a03f9edd6a..9c56a5ddb5fc4f46147bad8645698c940683b22e 100644 (file)
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -18,8 +18,6 @@ Distributed under the GPL
 using namespace std;
 using namespace Msp;
 
-#include <iostream>
-
 namespace Marklin {
 
 Train::Train(TrafficManager &tm, Locomotive &l):
@@ -30,8 +28,7 @@ Train::Train(TrafficManager &tm, Locomotive &l):
        travel_dist(0),
        travel_speed(0),
        pure_speed(false),
-       speed_scale(0.02),
-       speed_scale_weight(0),
+       real_speed(15),
        cur_track(0)
 {
        trfc_mgr.add_train(this);
@@ -61,8 +58,7 @@ void Train::set_speed(unsigned speed)
 {
        if(speed==target_speed)
                return;
-       if(!target_speed && speed)
-               travel_speed = static_cast<int>(round(speed*speed_scale*87*3.6/5))*5;
+       travel_speed = static_cast<int>(round(get_real_speed(speed)*87*3.6/5))*5;
 
        target_speed = speed;
        if(!target_speed)
@@ -148,7 +144,7 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
                if(cur_track->get_turnout_id())
                        route = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_route();
 
-               offset += speed_scale*loco.get_speed()*(dt/Time::sec);
+               offset += get_real_speed(loco.get_speed())*(dt/Time::sec);
                if(offset>cur_track->get_type().get_route_length(route))
                {
                        int out = cur_track->traverse(cur_track_ep, route);
@@ -172,7 +168,9 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 void Train::save(list<DataFile::Statement> &st) const
 {
        st.push_back((DataFile::Statement("name"), name));
-       st.push_back((DataFile::Statement("speed_scale"), speed_scale, speed_scale_weight));
+       for(unsigned i=0; i<=14; ++i)
+               if(real_speed[i].weight)
+                       st.push_back((DataFile::Statement("real_speed"), i, real_speed[i].speed, real_speed[i].weight));
 }
 
 void Train::locomotive_reverse_changed(bool)
@@ -205,16 +203,8 @@ void Train::sensor_event(bool state, Sensor *sensor)
 
                        if(pure_speed)
                        {
-                               float weight = loco.get_speed()*travel_dist;
-                               if(weight)
-                               {
-                                       weight *= weight;
-                                       float scale = travel_dist/travel_time_secs/loco.get_speed();
-                                       cout<<"Updating speed_scale: "<<speed_scale<<'x'<<speed_scale_weight<<" + "<<scale<<'x'<<weight<<'\n';
-                                       speed_scale = (speed_scale*speed_scale_weight+scale*weight)/(speed_scale_weight+weight);
-                                       speed_scale_weight += weight;
-                                       cout<<"  Result: "<<speed_scale<<'x'<<speed_scale_weight<<'\n';
-                               }
+                               RealSpeed &rs = real_speed[loco.get_speed()];
+                               rs.add(travel_dist/travel_time_secs, travel_time_secs);
                        }
 
                        travel_dist = 0;
@@ -365,6 +355,7 @@ void Train::update_speed()
                        if(i->block->get_sensor_id())
                                ++nsens;
 
+               unsigned slow_speed = find_speed(0.1);  // 31.3 km/h
                if(nsens==0)
                {
                        loco.set_speed(0);
@@ -372,9 +363,9 @@ void Train::update_speed()
                        try_reserve = Time::now()+2*Time::sec;
                        set_status("Blocked");
                }
-               else if(nsens==1 && target_speed>3)
+               else if(nsens==1 && target_speed>slow_speed)
                {
-                       loco.set_speed(3);
+                       loco.set_speed(slow_speed);
                        pure_speed = false;
                        try_reserve = Time::now()+2*Time::sec;
                        set_status("Slow");
@@ -388,6 +379,53 @@ void Train::update_speed()
        }
 }
 
+float Train::get_real_speed(unsigned i) const
+{
+       if(real_speed[i].weight)
+               return real_speed[i].speed;
+
+       unsigned low;
+       unsigned high;
+       for(low=i; low>0; --low)
+               if(real_speed[low].weight)
+                       break;
+       for(high=i; high<14; ++high)
+               if(real_speed[high].weight)
+                       break;
+
+       if(real_speed[high].weight)
+       {
+               if(real_speed[low].weight)
+               {
+                       float f = float(i-low)/(high-low);
+                       return real_speed[low].speed*(1-f)+real_speed[high].speed*f;
+               }
+               else
+                       return real_speed[high].speed*float(i)/high;
+       }
+       else if(real_speed[low].weight)
+               return real_speed[low].speed*float(i)/low;
+       else
+               return 0;
+}
+
+unsigned Train::find_speed(float real) const
+{
+       if(real<=real_speed[0].speed)
+               return 0;
+       if(real>=real_speed[14].speed)
+               return 14;
+
+       unsigned low = 0;
+       unsigned high = 0;
+       for(high=0; real_speed[high].speed<real; ++high)
+               if(real_speed[high].weight)
+                       low = high;
+
+       float f = (real-real_speed[low].speed)/(real_speed[high].speed-real_speed[low].speed);
+       return static_cast<unsigned>(low*(1-f)+high*f+0.5);
+}
+
 void Train::set_status(const string &s)
 {
        status = s;
@@ -410,11 +448,29 @@ void Train::release_reserved_blocks()
 }
 
 
+Train::RealSpeed::RealSpeed():
+       speed(0),
+       weight(0)
+{ }
+
+void Train::RealSpeed::add(float s, float w)
+{
+       speed = (speed*weight+s*w)/(weight+w);
+       weight = min(weight+w, 300.0f);
+}
+
+
 Train::Loader::Loader(Train &t):
        DataFile::BasicLoader<Train>(t)
 {
        add("name",        &Train::name);
-       add("speed_scale", &Train::speed_scale, &Train::speed_scale_weight);
+       add("real_speed",  &Loader::real_speed);
+}
+
+void Train::Loader::real_speed(unsigned i, float speed, float weight)
+{
+       obj.real_speed[i].speed = speed;
+       obj.real_speed[i].weight = weight;
 }
 
 } // namespace Marklin

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index e749a8336a09de542d0b6f0d3815b0f9437d121d..65caa3f9fb245cf4c2ed47e8d71b214f03413e40 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -26,6 +26,8 @@ public:
        {
        public:
                Loader(Train &);
+       private:
+               void real_speed(unsigned, float, float);
        };
 
        sigc::signal<void, const std::string &> signal_name_changed;
@@ -41,6 +43,15 @@ private:
                BlockRef(Block *s, unsigned e): block(s), entry(e) { }
        };
 
+       struct RealSpeed
+       {
+               float speed;
+               float weight;
+
+               RealSpeed();
+               void add(float, float);
+       };
+
        TrafficManager &trfc_mgr;
        std::string name;
        Locomotive &loco;
@@ -54,8 +65,7 @@ private:
        float travel_dist;
        unsigned travel_speed;
        bool pure_speed;
-       float speed_scale;
-       float speed_scale_weight;
+       std::vector<RealSpeed> real_speed;
 
        Track *cur_track;
        unsigned cur_track_ep;
@@ -84,6 +94,8 @@ private:
        void turnout_route_changed(unsigned, Turnout *);
        unsigned reserve_more();
        void update_speed();
+       float get_real_speed(unsigned) const;
+       unsigned find_speed(float) const;
        void set_status(const std::string &);
        void set_position(const Block::Endpoint &);
        void release_reserved_blocks();