Code reformatting: add spaces around assignment operators

[r2c2.git] / source / libmarklin / train.cpp

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index 7d6afbae1f1c074ad281712ae43cde0be3888460..341921aaf511000a406869cd78f0b566641ec420 100644 (file)
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -36,11 +36,11 @@ Train::Train(TrafficManager &tm, Locomotive &l):
 {
        trfc_mgr.add_train(this);
 
-       const map<unsigned, Sensor *> &sensors=trfc_mgr.get_control().get_sensors();
+       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();
+       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_route_changing.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_route_changing), i->second));
@@ -50,7 +50,7 @@ Train::Train(TrafficManager &tm, Locomotive &l):
 
 void Train::set_name(const string &n)
 {
-       name=n;
+       name = n;
 
        signal_name_changed.emit(name);
 }
@@ -58,9 +58,9 @@ void Train::set_name(const string &n)
 void Train::set_speed(unsigned speed)
 {
        if(!target_speed && speed)
-               travel_speed=static_cast<int>(round(speed*speed_scale*87*3.6/5))*5;
+               travel_speed = static_cast<int>(round(speed*speed_scale*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
@@ -72,7 +72,7 @@ void Train::set_speed(unsigned speed)
                reserve_more();
 
        update_speed();
-       pure_speed=false;
+       pure_speed = false;
 }
 
 void Train::place(Block *block, unsigned entry)
@@ -80,13 +80,13 @@ 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))
@@ -103,7 +103,7 @@ void Train::place(Block *block, unsigned entry)
 
 bool Train::free_block(Block *block)
 {
-       unsigned nsens=0;
+       unsigned nsens = 0;
        for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
        {
                if(i->block==block)
@@ -113,7 +113,7 @@ bool Train::free_block(Block *block)
                        while(i!=rsv_blocks.end())
                        {
                                i->block->reserve(0);
-                               i=rsv_blocks.erase(i);
+                               i = rsv_blocks.erase(i);
                        }
                        update_speed();
                        return true;
@@ -135,28 +135,28 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 
        if(cur_track)
        {
-               unsigned route=0;
+               unsigned route = 0;
                if(cur_track->get_turnout_id())
-                       route=trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_route();
+                       route = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_route();
 
-               offset+=speed_scale*loco.get_speed()*(dt/Time::sec);
+               offset += speed_scale*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);
+                       int out = cur_track->traverse(cur_track_ep, route);
                        if(out>=0)
                        {
-                               Track *next=cur_track->get_link(out);
+                               Track *next = cur_track->get_link(out);
                                if(next)
-                                       cur_track_ep=next->get_endpoint_by_link(*cur_track);
-                               cur_track=next;
-                               offset=0;
+                                       cur_track_ep = next->get_endpoint_by_link(*cur_track);
+                               cur_track = next;
+                               offset = 0;
                        }
                        else
-                               cur_track=0;
+                               cur_track = 0;
                }
 
                if(cur_track)
-                       pos=cur_track->get_point(cur_track_ep, route, offset);
+                       pos = cur_track->get_point(cur_track_ep, route, offset);
        }
 }
 
@@ -168,7 +168,7 @@ void Train::save(list<DataFile::Statement> &st) const
 
 void Train::sensor_event(bool state, Sensor *sensor)
 {
-       unsigned addr=sensor->get_address();
+       unsigned addr = sensor->get_address();
 
        if(state)
        {
@@ -179,32 +179,32 @@ void Train::sensor_event(bool state, Sensor *sensor)
 
                if(i!=rsv_blocks.begin())
                {
-                       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;
+                       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;
 
                        if(pure_speed)
                        {
-                               float weight=loco.get_speed()*travel_dist;
+                               float weight = loco.get_speed()*travel_dist;
                                if(weight)
                                {
-                                       weight*=weight;
-                                       float scale=travel_dist/travel_time_secs/loco.get_speed();
+                                       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;
+                                       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';
                                }
                        }
 
-                       travel_dist=0;
+                       travel_dist = 0;
                        float block_len;
                        for(list<BlockRef>::iterator j=rsv_blocks.begin(); j!=i; ++j)
                        {
                                j->block->traverse(j->entry, &block_len);
-                               travel_dist+=block_len;
+                               travel_dist += block_len;
                        }
-                       last_entry_time=Time::now();
-                       pure_speed=true;
+                       last_entry_time = Time::now();
+                       pure_speed = true;
 
                        cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
                }
@@ -238,12 +238,12 @@ void Train::sensor_event(bool state, Sensor *sensor)
 
 void Train::turnout_route_changing(unsigned, Turnout *turnout)
 {
-       unsigned tid=turnout->get_address();
+       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;
+       unsigned nsens = 0;
        for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
        {
                if(i->block->get_turnout_id()==tid)
@@ -259,14 +259,14 @@ void Train::turnout_route_changing(unsigned, Turnout *turnout)
 
 void Train::turnout_route_changed(unsigned, Turnout *turnout)
 {
-       unsigned tid=turnout->get_address();
+       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);
+                               i = rsv_blocks.erase(i);
                        }
                        reserve_more();
                        update_speed();
@@ -276,34 +276,34 @@ void Train::turnout_route_changed(unsigned, Turnout *turnout)
 
 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 0;
 
-       unsigned nsens=0;
+       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;
+       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();
+                               last = &rsv_blocks.back();
                                if(last->block->get_sensor_id())
                                {
                                        ++nsens;
-                                       result=true;
+                                       result = true;
                                }
                        }
                        else
@@ -318,9 +318,9 @@ unsigned Train::reserve_more()
                last->block->reserve(0);
                rsv_blocks.erase(--rsv_blocks.end());
                if(!rsv_blocks.empty())
-                       last=&rsv_blocks.back();
+                       last = &rsv_blocks.back();
                else
-                       last=0;
+                       last = 0;
        }
 
        return nsens;
@@ -331,12 +331,12 @@ void Train::update_speed()
        if(!target_speed)
        {
                loco.set_speed(0);
-               try_reserve=Time::TimeStamp();
+               try_reserve = Time::TimeStamp();
                set_status("Stopped");
        }
        else
        {
-               unsigned nsens=0;
+               unsigned nsens = 0;
                for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
                        if(i->block->get_sensor_id())
                                ++nsens;
@@ -344,21 +344,21 @@ void Train::update_speed()
                if(nsens==0)
                {
                        loco.set_speed(0);
-                       pure_speed=false;
-                       try_reserve=Time::now()+2*Time::sec;
+                       pure_speed = false;
+                       try_reserve = Time::now()+2*Time::sec;
                        set_status("Blocked");
                }
                else if(nsens==1 && target_speed>3)
                {
                        loco.set_speed(3);
-                       pure_speed=false;
-                       try_reserve=Time::now()+2*Time::sec;
+                       pure_speed = false;
+                       try_reserve = Time::now()+2*Time::sec;
                        set_status("Slow");
                }
                else
                {
                        loco.set_speed(target_speed);
-                       try_reserve=Time::TimeStamp();
+                       try_reserve = Time::TimeStamp();
                        set_status(format("Traveling %d kmh", travel_speed));
                }
        }
@@ -366,16 +366,16 @@ void Train::update_speed()
 
 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);
+       cur_track = bep.track;
+       cur_track_ep = bep.track_ep;
+       offset = 0;
+       pos = cur_track->get_endpoint_position(cur_track_ep);
 }