/* $Id$
This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
#include <msp/time/units.h>
#include <msp/time/utils.h>
#include "control.h"
+#include "except.h"
+#include "tracktype.h"
#include "trafficmanager.h"
#include "train.h"
-using namespace Msp;
-
-#include <iostream>
using namespace std;
+using namespace Msp;
namespace Marklin {
target_speed(0),
status("Unplaced"),
travel_dist(0),
- real_speed(0)
+ travel_speed(0),
+ pure_speed(false),
+ real_speed(15),
+ cur_track(0)
{
trfc_mgr.add_train(this);
- const map<unsigned, Sensor *> &sensors=trfc_mgr.get_control().get_sensors();
+ loco.signal_reverse_changed.connect(sigc::mem_fun(this, &Train::locomotive_reverse_changed));
+
+ const map<unsigned, Sensor *> &sensors = trfc_mgr.get_control().get_sensors();
for(map<unsigned, Sensor *>::const_iterator i=sensors.begin(); i!=sensors.end(); ++i)
i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::sensor_event), i->second));
+
+ const map<unsigned, Turnout *> &turnouts = trfc_mgr.get_control().get_turnouts();
+ for(map<unsigned, Turnout *>::const_iterator i=turnouts.begin(); i!=turnouts.end(); ++i)
+ {
+ i->second->signal_path_changing.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changing), i->second));
+ i->second->signal_path_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), i->second));
+ }
}
void Train::set_name(const string &n)
{
- name=n;
+ name = n;
signal_name_changed.emit(name);
}
void Train::set_speed(unsigned speed)
{
- unsigned old_speed=target_speed;
+ if(speed==target_speed)
+ return;
+ travel_speed = static_cast<int>(round(get_real_speed(speed)*87*3.6/5))*5;
- target_speed=speed;
+ target_speed = speed;
if(!target_speed)
{
- // XXX We might roll onto a new sensor and get confused - should delay freeing blocks a bit
- for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- i->block->reserve(0);
- rsv_blocks.clear();
- try_reserve=Time::TimeStamp();
+ trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect(
+ sigc::bind_return(sigc::mem_fun(this, &Train::release_reserved_blocks), false));
}
- else if(rsv_blocks.empty() && !reserve_more())
- return;
+ else
+ reserve_more();
- loco.set_speed(speed);
- if(!old_speed && target_speed)
- set_status("Traveling --- kmh");
- else if(old_speed && !target_speed)
- set_status("Stopped");
+ signal_target_speed_changed.emit(target_speed);
+
+ update_speed();
+ pure_speed = false;
+}
+
+void Train::set_reverse(bool rev)
+{
+ loco.set_reverse(rev);
}
void Train::place(Block *block, unsigned entry)
for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end();)
{
i->block->reserve(0);
- i=rsv_blocks.erase(i);
+ i = rsv_blocks.erase(i);
}
for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end();)
{
i->block->reserve(0);
- i=cur_blocks.erase(i);
+ i = cur_blocks.erase(i);
}
if(!block->reserve(this))
}
cur_blocks.push_back(BlockRef(block, entry));
+ set_position(block->get_endpoints()[entry]);
set_status("Stopped");
}
bool Train::free_block(Block *block)
{
+ unsigned nsens = 0;
for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ {
if(i->block==block)
{
+ if(nsens<1)
+ return false;
while(i!=rsv_blocks.end())
{
i->block->reserve(0);
- i=rsv_blocks.erase(i);
+ i = rsv_blocks.erase(i);
}
+ update_speed();
return true;
}
+ else if(i->block->get_sensor_id())
+ ++nsens;
+ }
return false;
}
-void Train::tick(const Time::TimeStamp &t)
+void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
{
if(try_reserve && t>try_reserve)
{
- if(reserve_more() || !rsv_blocks.empty())
+ reserve_more();
+ update_speed();
+ }
+
+ if(cur_track)
+ {
+ unsigned path = 0;
+ if(cur_track->get_turnout_id())
+ path = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_path();
+
+ offset += get_real_speed(loco.get_speed())*(dt/Time::sec);
+ if(offset>cur_track->get_type().get_path_length(path))
{
- loco.set_speed(target_speed);
- set_status("Traveling --- kmh");
- try_reserve=Time::TimeStamp();
+ int out = cur_track->traverse(cur_track_ep, path);
+ if(out>=0)
+ {
+ Track *next = cur_track->get_link(out);
+ if(next)
+ cur_track_ep = next->get_endpoint_by_link(*cur_track);
+ cur_track = next;
+ offset = 0;
+ }
+ else
+ cur_track = 0;
}
- else
- try_reserve=t+2*Time::sec;
+
+ if(cur_track)
+ pos = cur_track->get_point(cur_track_ep, path, offset);
+ }
+}
+
+void Train::save(list<DataFile::Statement> &st) const
+{
+ st.push_back((DataFile::Statement("name"), name));
+ 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)
+{
+ for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ i->block->reserve(0);
+ rsv_blocks.clear();
+ cur_blocks.reverse();
+ for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+ i->entry = i->block->traverse(i->entry);
+ reserve_more();
+ update_speed();
+
+ if(cur_track)
+ {
+ unsigned path = 0;
+ if(unsigned turnout = cur_track->get_turnout_id())
+ path = trfc_mgr.get_control().get_turnout(turnout).get_path();
+ cur_track_ep = cur_track->traverse(cur_track_ep, path);
+ offset = cur_track->get_type().get_path_length(path)-offset;
}
}
void Train::sensor_event(bool state, Sensor *sensor)
{
- unsigned addr=sensor->get_address();
+ unsigned addr = sensor->get_address();
if(state)
{
if(i!=rsv_blocks.begin())
{
- real_speed=static_cast<int>(round(travel_dist/((Time::now()-last_entry_time)/Time::sec)*87*3.6/5))*5;
- set_status(format("Traveling %3d kmh", real_speed));
+ float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
+ travel_speed = static_cast<int>(round(travel_dist/travel_time_secs*87*3.6/5))*5;
- travel_dist=0;
+ if(pure_speed)
+ {
+ RealSpeed &rs = real_speed[loco.get_speed()];
+ rs.add(travel_dist/travel_time_secs, travel_time_secs);
+ }
+
+ travel_dist = 0;
float block_len;
for(list<BlockRef>::iterator j=rsv_blocks.begin(); j!=i; ++j)
{
j->block->traverse(j->entry, &block_len);
- cout<<"Advancing: block "<<j->block<<" (sensor "<<j->block->get_sensor_id()<<") length "<<block_len<<'\n';
- travel_dist+=block_len;
+ travel_dist += block_len;
}
- last_entry_time=Time::now();
+ last_entry_time = Time::now();
+ pure_speed = true;
cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
- cout<<"Train "<<name<<" advanced, "<<cur_blocks.size()<<" cur_blocks, "<<rsv_blocks.size()<<" rsv_blocks\n";
}
- if(target_speed && !reserve_more() && rsv_blocks.empty())
+ for(i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+ if(i->block->get_sensor_id()==addr)
+ set_position(i->block->get_endpoints()[i->entry]);
+
+ if(target_speed)
{
- loco.set_speed(0);
- try_reserve=Time::now()+2*Time::sec;
- set_status("Blocked");
+ reserve_more();
+ update_speed();
}
}
else
{
- cout<<"Train "<<name<<" finding blocks to free\n";
- list<BlockRef>::iterator i;
- for(i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- {
- if(i->block->get_sensor_id()==addr)
+ for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+ if(unsigned b_addr = i->block->get_sensor_id())
{
- ++i;
- for(list<BlockRef>::iterator j=cur_blocks.begin(); j!=i; ++j)
- j->block->reserve(0);
- cout<<" "<<distance(cur_blocks.begin(), i)<<" blocks freed, ";
- cur_blocks.erase(cur_blocks.begin(), i);
- cout<<cur_blocks.size()<<" cur_blocks\n";
+ if(b_addr==addr)
+ {
+ ++i;
+ for(list<BlockRef>::iterator j=cur_blocks.begin(); j!=i; ++j)
+ j->block->reserve(0);
+ cur_blocks.erase(cur_blocks.begin(), i);
+ }
+ break;
}
- }
if(target_speed)
reserve_more();
}
}
-bool Train::reserve_more()
+void Train::turnout_path_changing(unsigned, Turnout *turnout)
+{
+ unsigned tid = turnout->get_address();
+ for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+ if(i->block->get_turnout_id()==tid)
+ throw TurnoutBusy(this);
+
+ unsigned nsens = 0;
+ for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ {
+ if(i->block->get_turnout_id()==tid)
+ {
+ if(nsens<1)
+ throw TurnoutBusy(this);
+ break;
+ }
+ else if(i->block->get_sensor_id())
+ ++nsens;
+ }
+}
+
+void Train::turnout_path_changed(unsigned, Turnout *turnout)
+{
+ unsigned tid = turnout->get_address();
+ for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ if(i->block->get_turnout_id()==tid)
+ {
+ while(i!=rsv_blocks.end())
+ {
+ i->block->reserve(0);
+ i = rsv_blocks.erase(i);
+ }
+ reserve_more();
+ update_speed();
+ return;
+ }
+}
+
+unsigned Train::reserve_more()
{
- BlockRef *last=0;
+ BlockRef *last = 0;
if(!rsv_blocks.empty())
- last=&rsv_blocks.back();
+ last = &rsv_blocks.back();
else if(!cur_blocks.empty())
- last=&cur_blocks.back();
+ last = &cur_blocks.back();
if(!last)
- return false;
+ return 0;
- cout<<"Train "<<name<<" reserving more blocks\n";
+ unsigned nsens = 0;
+ for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ if(i->block->get_sensor_id())
+ ++nsens;
- bool result=false;
- unsigned size=rsv_blocks.size();
- while(size<3)
+ bool result = false;
+ while(nsens<2)
{
- int exit=last->block->traverse(last->entry);
+ int exit = last->block->traverse(last->entry);
if(exit>=0)
{
- Block *link=last->block->get_link(exit);
+ Block *link = last->block->get_link(exit);
if(link && link->reserve(this))
{
rsv_blocks.push_back(BlockRef(link, link->get_endpoint_by_link(*last->block)));
- last=&rsv_blocks.back();
- ++size;
- result=true;
+ last = &rsv_blocks.back();
+ if(last->block->get_sensor_id())
+ {
+ ++nsens;
+ result = true;
+ }
}
else
break;
break;
}
- cout<<" "<<rsv_blocks.size()<<" rsv_blocks\n";
+ while(last && !last->block->get_sensor_id())
+ {
+ last->block->reserve(0);
+ rsv_blocks.erase(--rsv_blocks.end());
+ if(!rsv_blocks.empty())
+ last = &rsv_blocks.back();
+ else
+ last = 0;
+ }
+
+ return nsens;
+}
+
+void Train::update_speed()
+{
+ if(!target_speed)
+ {
+ loco.set_speed(0);
+ try_reserve = Time::TimeStamp();
+ set_status("Stopped");
+ }
+ else
+ {
+ unsigned nsens = 0;
+ for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ 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);
+ pure_speed = false;
+ try_reserve = Time::now()+2*Time::sec;
+ set_status("Blocked");
+ }
+ else if(nsens==1 && target_speed>slow_speed)
+ {
+ loco.set_speed(slow_speed);
+ pure_speed = false;
+ try_reserve = Time::now()+2*Time::sec;
+ set_status("Slow");
+ }
+ else
+ {
+ loco.set_speed(target_speed);
+ try_reserve = Time::TimeStamp();
+ set_status(format("Traveling %d kmh", travel_speed));
+ }
+ }
+}
+
+float Train::get_real_speed(unsigned i) const
+{
+ if(real_speed[i].weight)
+ return real_speed[i].speed;
- return result;
+ 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;
+ status = s;
signal_status_changed.emit(s);
}
+void Train::set_position(const Block::Endpoint &bep)
+{
+ cur_track = bep.track;
+ cur_track_ep = bep.track_ep;
+ offset = 0;
+ pos = cur_track->get_endpoint_position(cur_track_ep);
+}
+
+void Train::release_reserved_blocks()
+{
+ for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ i->block->reserve(0);
+ rsv_blocks.clear();
+}
+
+
+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("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
projects / r2c2.git / blobdiff