# HG changeset patch # User KUDr # Date 1163674302 0 # Node ID 15148a0e3bb8440b6cb25141b6708e79be7606f3 # Parent 6f4c15b49da0bf769605c7819b8db8cd6fe3cfcc (svn r7164) -Fix: [YAPF] assert when look-ahead polynomial result (red-signal penalty) is negative. Such penalty is now added as positive penalty for the appropriate green signal. (DannyA) diff -r 6f4c15b49da0 -r 15148a0e3bb8 yapf/yapf_costrail.hpp --- a/yapf/yapf_costrail.hpp Thu Nov 16 00:09:39 2006 +0000 +++ b/yapf/yapf_costrail.hpp Thu Nov 16 10:51:42 2006 +0000 @@ -100,9 +100,16 @@ n.m_segment->flags_u.flags_s.m_end_of_line = true; } else if (has_signal_along) { SignalState sig_state = GetSignalStateByTrackdir(tile, trackdir); + // cache the look-ahead polynomial constant only if we didn't pass more signals than the look-ahead limit is + int look_ahead_cost = (n.m_num_signals_passed < m_sig_look_ahead_costs.Size()) ? m_sig_look_ahead_costs.Data()[n.m_num_signals_passed] : 0; if (sig_state != SIGNAL_STATE_RED) { // green signal n.flags_u.flags_s.m_last_signal_was_red = false; + // negative look-ahead red-signal penalties would cause problems later, so use them as positive penalties for green signal + if (look_ahead_cost < 0) { + // add its negation to the cost + cost -= look_ahead_cost; + } } else { // we have a red signal in our direction // was it first signal which is two-way? @@ -116,8 +123,9 @@ n.flags_u.flags_s.m_last_signal_was_red = true; // look-ahead signal penalty - if (n.m_num_signals_passed < m_sig_look_ahead_costs.Size()) { - cost += m_sig_look_ahead_costs.Data()[n.m_num_signals_passed]; + if (look_ahead_cost > 0) { + // add the look ahead penalty only if it is positive + cost += look_ahead_cost; } // special signal penalties