X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=6cb3205eb175fad4f6e6d8b18997a725df2da7b5;hb=57e0944ee8ed442e2d0aa7c9964cac00450af5e7;hp=d1fb4ed8a81b9608bb82827ccbf5071a3b395251;hpb=d2dfed1a38c5e8487532e9055fad464cf54efd83;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index d1fb4ed..6cb3205 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -36,7 +36,6 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 	allocator(*this),
 	advancing(false),
 	controller(new SimpleController),
-	active(false),
 	current_speed_step(0),
 	speed_changing(false),
 	reverse(false),
@@ -126,23 +125,6 @@ void Train::set_control(const string &n, float v)
 	controller->set_control(n, v);
 }
 
-void Train::set_active(bool a)
-{
-	if(a==active)
-		return;
-	if(!a && controller->get_speed())
-		throw logic_error("moving");
-
-	active = a;
-	if(active)
-	{
-		stop_timeout = Time::TimeStamp();
-		allocator.reserve_more();
-	}
-	else
-		stop_timeout = Time::now()+2*Time::sec;
-}
-
 void Train::set_function(unsigned func, bool state)
 {
 	if(!loco_type.get_functions().count(func))
@@ -199,10 +181,8 @@ void Train::place(const BlockIter &block)
 	if(controller->get_speed())
 		throw logic_error("moving");
 
-	set_active(false);
-	accurate_position = false;
-
 	allocator.start_from(block);
+	accurate_position = false;
 
 	if(reverse)
 		vehicles.front()->place(block.reverse().track_iter(), 0, Vehicle::FRONT_BUFFER);
@@ -216,8 +196,6 @@ void Train::unplace()
 		throw logic_error("moving");
 
 	allocator.clear();
-
-	set_active(false);
 	accurate_position = false;
 
 	for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
@@ -227,48 +205,48 @@ void Train::unplace()
 void Train::stop_at(Block *block)
 {
 	allocator.stop_at(block);
-	if(active && !block)
-		allocator.reserve_more();
 }
 
-bool Train::free_block(Block &block)
+bool Train::is_block_critical(const Block &block) const
 {
-	if(get_reserved_distance_until(&block)<controller->get_braking_distance()*1.3)
-		return false;
-
-	return allocator.release_from(block);
+	return get_reserved_distance_until(&block)<controller->get_braking_distance()*1.3;
 }
 
-void Train::free_noncritical_blocks()
+BlockIter Train::get_first_noncritical_block() const
 {
 	if(allocator.empty())
-		return;
+		return BlockIter();
+
+	BlockIter i = allocator.last_current().next();
 
 	if(controller->get_speed()==0)
-	{
-		allocator.release_noncurrent();
-		return;
-	}
+		return i;
 
 	float margin = 10*layout.get_catalogue().get_scale();
 	float min_dist = controller->get_braking_distance()*1.3+margin;
 
-	BlockIter i = allocator.last_current().next();
 	float dist = 0;
 	bool sensor_seen = false;
 	for(; i->get_train()==this; i=i.next())
 	{
 		if(dist>min_dist && sensor_seen)
-		{
-			allocator.release_from(*i);
-			return;
-		}
+			return i;
 
 		dist += i->get_path_length(i.entry());
 
 		if(i->get_sensor_id())
 			sensor_seen = true;
 	}
+
+	return i;
+}
+
+void Train::refresh_blocks_from(Block &block)
+{
+	if(is_block_critical(block))
+		allocator.rewind_to(*get_first_noncritical_block());
+	else
+		allocator.rewind_to(block);
 }
 
 float Train::get_reserved_distance() const
@@ -284,23 +262,30 @@ float Train::get_reserved_distance() const
 	return max(get_reserved_distance_until(0)-margin, 0.0f);
 }
 
-void Train::reserve_more()
+void Train::tick(const Time::TimeDelta &dt)
 {
-	allocator.reserve_more();
-}
-
-void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
-{
-	if(!active && stop_timeout && t>=stop_timeout)
+	if(stop_timeout)
 	{
-		allocator.release_noncurrent();
-		stop_timeout = Time::TimeStamp();
+		stop_timeout -= dt;
+		if(stop_timeout<=Time::zero)
+		{
+			allocator.set_active(false);
+			stop_timeout = Time::TimeDelta();
+		}
 	}
 
+	travel_time += dt;
+
 	Driver &driver = layout.get_driver();
 
+	bool intent_to_move = false;
 	for(list<TrainAI *>::iterator i=ais.begin(); i!=ais.end(); ++i)
-		(*i)->tick(t, dt);
+	{
+		(*i)->tick(dt);
+		if((*i)->has_intent_to_move())
+			intent_to_move = true;
+	}
+
 	controller->tick(dt);
 	float speed = controller->get_speed();
 	bool moving = speed>0;
@@ -314,8 +299,6 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 		driver.set_loco_reverse(address, r);
 
 		allocator.reverse();
-		if(active)
-			allocator.reserve_more();
 	}
 
 	if(speed_quantizer)
@@ -334,8 +317,8 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 
 	if(moving)
 	{
-		if(!active)
-			set_active(true);
+		if(!allocator.is_active())
+			allocator.set_active(true);
 
 		Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front());
 
@@ -355,6 +338,8 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 			}
 		}
 	}
+	else if(allocator.is_active() && !intent_to_move && !stop_timeout)
+		stop_timeout = 2*Time::sec;
 }
 
 void Train::save(list<DataFile::Statement> &st) const
@@ -449,7 +434,7 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 
 			if(travel_distance>0)
 			{
-				float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
+				float travel_time_secs = travel_time/Time::sec;
 
 				if(travel_time_secs>=2)
 					speed_quantizer->learn(current_speed_step, travel_distance/travel_time_secs, travel_time_secs);
@@ -457,7 +442,7 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 		}
 
 		last_entry_block = allocator.iter_for(*block);
-		last_entry_time = Time::now();
+		travel_time = Time::zero;
 		pure_speed = true;
 		accurate_position = true;
 		overshoot_dist = 0;