diff options
| -rw-r--r-- | advtrains/debugringbuffer.lua | 5 | ||||
| -rw-r--r-- | advtrains/init.lua | 14 | ||||
| -rw-r--r-- | advtrains/lzb.lua | 11 | ||||
| -rw-r--r-- | advtrains/trainlogic.lua | 71 | ||||
| -rw-r--r-- | advtrains_interlocking/approach.lua | 4 | ||||
| -rw-r--r-- | advtrains_luaautomation/active_common.lua | 5 |
6 files changed, 82 insertions, 28 deletions
diff --git a/advtrains/debugringbuffer.lua b/advtrains/debugringbuffer.lua index 704c0c5..bdb4a3a 100644 --- a/advtrains/debugringbuffer.lua +++ b/advtrains/debugringbuffer.lua @@ -24,7 +24,10 @@ function advtrains.drb_dump(tid) return end repeat - atdebug(ringbufs[tid][ringbufcnt[tid]]) + local t = ringbufs[tid][ringbufcnt[tid]] + if t then + atdebug(t) + end ringbufcnt[tid]=ringbufcnt[tid]+1 if ringbufcnt[tid] > ringbuflen then ringbufcnt[tid]=0 diff --git a/advtrains/init.lua b/advtrains/init.lua index d21a887..7d400dc 100644 --- a/advtrains/init.lua +++ b/advtrains/init.lua @@ -37,7 +37,7 @@ local GENERATE_ATRICIFIAL_LAG = false local HOW_MANY_LAG = 1.0 -- Simulate a higher server step interval, as it occurs when the server is on high load -advtrains.IGNORE_WORLD = false +advtrains.IGNORE_WORLD = true -- Run advtrains without respecting the world map -- - No world collision checks occur -- - The NDB forcibly places all nodes stored in it into the world regardless of the world's content. @@ -45,7 +45,7 @@ advtrains.IGNORE_WORLD = false -- This mode can be useful for debugging/testing a world without the map data available -- In this case, choose 'singlenode' as mapgen -local NO_SAVE = false +local NO_SAVE = true -- Do not save any data to advtrains save files -- ========================================================================== @@ -589,7 +589,7 @@ minetest.register_globalstep(function(dtime_mt) t = os.clock()+HOW_MANY_LAG end - advtrains.mainloop_trainlogic(dtime) + advtrains.mainloop_trainlogic(dtime,advtrains.mainloop_runcnt) if advtrains_itm_mainloop then advtrains_itm_mainloop(dtime) end @@ -639,10 +639,6 @@ function advtrains.save(remove_players_from_wagons) return end - -- Cleanup actions - --TODO very simple yet hacky workaround for the "green signals" bug - advtrains.invalidate_all_paths() - if advtrains.IGNORE_WORLD then advtrains.ndb.restore_all() end @@ -660,6 +656,10 @@ function advtrains.save(remove_players_from_wagons) atlatc.save() end atprint("[save_all]Saved advtrains save files") + + -- Cleanup actions + --TODO very simple yet hacky workaround for the "green signals" bug + advtrains.invalidate_all_paths() end minetest.register_on_shutdown(advtrains.save) diff --git a/advtrains/lzb.lua b/advtrains/lzb.lua index a5e361c..1aa9e5f 100644 --- a/advtrains/lzb.lua +++ b/advtrains/lzb.lua @@ -77,10 +77,15 @@ end local function look_ahead(id, train) local acc = advtrains.get_acceleration(train, 1) - local vel = train.velocity + -- worst-case: the starting point is maximum speed + local vel = train.max_speed or train.velocity local brakedst = ( -(vel*vel) / (2*acc) ) * params.DST_FACTOR - local brake_i = advtrains.path_get_index_by_offset(train, train.index, brakedst + params.BRAKE_SPACE) + --local brake_i = advtrains.path_get_index_by_offset(train, train.index, brakedst + params.BRAKE_SPACE) + -- worst case (don't use index_by_offset) + brake_i = atfloor(train.index + brakedst + params.BRAKE_SPACE) + atprint("LZB: looking ahead up to ", brake_i) + --local aware_i = advtrains.path_get_index_by_offset(train, brake_i, AWARE_ZONE) local lzb = train.lzb @@ -122,6 +127,7 @@ local function call_runover_callbacks(id, train) local ckp = train.lzb.checkpoints while ckp[i] do if ckp[i].index <= idx then + atprint("LZB: checkpoint run over: i=",ckp[i].index,"s=",ckp[i].speed) -- call callback local it = ckp[i] if it.callback then @@ -140,6 +146,7 @@ local function apply_checkpoint_to_path(train, checkpoint) if not checkpoint.speed then return end + atprint("LZB: applying checkpoint: i=",checkpoint.index,"s=",checkpoint.speed) -- make sure path exists until checkpoint local pos = advtrains.path_get(train, checkpoint.index) diff --git a/advtrains/trainlogic.lua b/advtrains/trainlogic.lua index 3870ef6..3dd0e4d 100644 --- a/advtrains/trainlogic.lua +++ b/advtrains/trainlogic.lua @@ -66,7 +66,7 @@ local LZB_ZERO_APPROACH_SPEED = 0.2 tp_player_tmr = 0 -advtrains.mainloop_trainlogic=function(dtime) +advtrains.mainloop_trainlogic=function(dtime, stepno) --build a table of all players indexed by pts. used by damage and door system. advtrains.playersbypts={} for _, player in pairs(minetest.get_connected_players()) do @@ -98,6 +98,7 @@ advtrains.mainloop_trainlogic=function(dtime) for k,v in pairs(advtrains.trains) do advtrains.atprint_context_tid=k + atprint("=== Step",stepno,"===") advtrains.train_ensure_init(k, v) end @@ -257,7 +258,10 @@ function advtrains.train_ensure_init(id, train) end train.dirty = true - if train.no_step then return nil end + if train.no_step then + atprint("in ensure_init: no_step set, train step ignored!") + return nil + end assertdef(train, "velocity", 0) --assertdef(train, "tarvelocity", 0) @@ -266,11 +270,13 @@ function advtrains.train_ensure_init(id, train) if not train.drives_on or not train.max_speed then + atprint("in ensure_init: missing properties, updating!") advtrains.update_trainpart_properties(id) end --restore path if not train.path then + atprint("in ensure_init: Needs restoring path...") if not train.last_pos then atlog("Train",id,": Restoring path failed, no last_pos set! Train will be disabled. You can try to fix the issue in the save file.") train.no_step = true @@ -293,6 +299,8 @@ function advtrains.train_ensure_init(id, train) local result = advtrains.path_create(train, train.last_pos, train.last_connid or 1, train.last_frac or 0) + atprint("in ensure_init: path_create result ",result) + if result==false then atlog("Train",id,": Restoring path failed, node at",train.last_pos,"is gone! Train will be disabled. You can try to place a rail at this position and restart the server.") train.no_step = true @@ -350,14 +358,17 @@ function advtrains.train_step_b(id, train, dtime) if not train_moves then train.recently_collided_with_env=nil--reset status when stopped end + atprint("in train_step_b: applying collided_with_env") v_target_apply(v_targets, VLEVER_EMERG, 0) end if train.locomotives_in_train==0 then + atprint("in train_step_b: applying no_locomotives") v_target_apply(v_targets, VLEVER_ROLL, 0) end -- interlocking speed restriction if train.speed_restriction then + atprint("in train_step_b: applying interlocking speed restriction",train.speed_restriction) v_target_apply(v_targets, VLEVER_BRAKE, train.speed_restriction) end @@ -367,9 +378,11 @@ function advtrains.train_step_b(id, train, dtime) train.off_track = front_off_track or back_off_track if back_off_track then + atprint("in train_step_b: applying back_off_track") v_target_apply(v_targets, VLEVER_EMERG, 1) else if front_off_track then + atprint("in train_step_b: applying front_off_track") v_target_apply(v_targets, VLEVER_EMERG, 0) end end @@ -379,15 +392,28 @@ function advtrains.train_step_b(id, train, dtime) local v0 = train.velocity if train.ctrl_user then + atprint("in train_step_b: ctrl_user active, resetting atc") advtrains.atc.train_reset_command(train) else + if train.atc_command then + if (not train.atc_delay or train.atc_delay<=0) and not train.atc_wait_finish then + advtrains.atc.execute_atc_command(id, train) + else + train.atc_delay=train.atc_delay-dtime + end + elseif train.atc_delay then + train.atc_delay = nil + end + local braketar = train.atc_brake_target local emerg = false -- atc_brake_target==-1 means emergency brake (BB command) if braketar == -1 then braketar = 0 emerg = true end + atprint("in train_step_b: ATC: brake state braketar=",braketar,"emerg=",emerg) if braketar and braketar>=v0 then + atprint("in train_step_b: ATC: brake target cleared") train.atc_brake_target=nil braketar = nil end @@ -399,27 +425,22 @@ function advtrains.train_step_b(id, train, dtime) train.atc_wait_finish=nil end end - if train.atc_command then - if (not train.atc_delay or train.atc_delay<=0) and not train.atc_wait_finish then - advtrains.atc.execute_atc_command(id, train) - else - train.atc_delay=train.atc_delay-dtime - end - elseif train.atc_delay then - train.atc_delay = nil - end if train.tarvelocity and train.tarvelocity>v0 then + atprint("in train_step_b: applying ATC ACCEL", train.tarvelocity) v_target_apply(v_targets, VLEVER_ACCEL, train.tarvelocity) end if train.tarvelocity and train.tarvelocity<v0 then if (braketar and braketar<v0) then if emerg then + atprint("in train_step_b: applying ATC EMERG", train.tarvelocity) v_target_apply(v_targets, VLEVER_EMERG, 0) else + atprint("in train_step_b: applying ATC BRAKE", train.tarvelocity) v_target_apply(v_targets, VLEVER_BRAKE, braketar) end else + atprint("in train_step_b: applying ATC ROLL", train.tarvelocity) v_target_apply(v_targets, VLEVER_ROLL, train.tarvelocity) end end @@ -427,6 +448,7 @@ function advtrains.train_step_b(id, train, dtime) local userc = train.ctrl_user if userc then + atprint("in train_step_b: applying user control", userc) v_target_apply(v_targets, userc, userc==VLEVER_ACCEL and train.max_speed or 0) end @@ -453,7 +475,7 @@ function advtrains.train_step_b(id, train, dtime) end end end - + atprint("in train_step_b: Resulting control before LZB: lever", tv_lever, "target", tv_target) --train.debug = dump({tv_target,tv_lever}) --- 2c. If no tv_lever set, honor the user control --- @@ -465,6 +487,8 @@ function advtrains.train_step_b(id, train, dtime) train.lever = a_lever + atprint("in train_step_b: Current index",train.index,"end",train.end_index,"vel",train.velocity) + --- 3a. calculate the acceleration required to reach the speed restriction in path_speed (LZB) --- -- Iterates over the path nodes we WOULD pass if we were continuing with the speed assumed by actual_lever -- and determines the MINIMUM of path_speed in this range. @@ -487,6 +511,7 @@ function advtrains.train_step_b(id, train, dtime) if psp then lzb_target = lzb_target and math.min(lzb_target, psp) or psp if psp == 0 and not lzb_next_zero_barrier then + atprint("in train_step_b: Found zero barrier: ",i) lzb_next_zero_barrier = i - LZB_ZERO_APPROACH_DIST end end @@ -496,7 +521,7 @@ function advtrains.train_step_b(id, train, dtime) i = i + 1 end - --train.debug = "newindex calc "..new_index_curr_tv.." basev="..new_index_v_base.." lzbtarget="..(lzb_target or "nil") + atprint("in train_step_b: LZB calculation yields newindex=",new_index_curr_tv," basev=",new_index_v_base," lzbtarget=",lzb_target,"zero_barr=",lzb_next_zero_barrier,"") if lzb_target and lzb_target <= v0 then -- apply to tv_target after the actual calculation happened @@ -506,28 +531,34 @@ function advtrains.train_step_b(id, train, dtime) if train.index >= lzb_next_zero_barrier then tv_target = 0 a_lever = VLEVER_BRAKE + atprint("in train_step_b: -!- Hit zero approach barrier -!- applying brake") --atdebug("zeroappr cancelling train has passed idx=",train.index, "za_idx=",lzb_zeroappr_target_index) else -- if we are in front of a zero barrier, make sure we reach it by -- keeping the velocity at a small value >0 + atprint("in train_step_b: In zero approach, applying ZERO_APPROACH_SPEED") tv_target = LZB_ZERO_APPROACH_SPEED end else + atprint("in train_step_b: applying LZB brake to",lzb_target) tv_target = lzb_target end end - - + -- Case: v0 is below lzb_target, but a_lever is ACCEL and resulting v would be greater than lzb_target + -- limit tv_target to the lzb target. + elseif lzb_target and a_lever >= VLEVER_ACCEL then + tv_target = lzb_target end end --- 3b. now that we know tv_target and a_lever, calculate effective new v and change it on train + atprint("in train_step_b: Final control: target",tv_target,"lever",a_lever) local dv = advtrains.get_acceleration(train, a_lever) * dtime local v1 local tv_effective = false if tv_target and (math.abs(dv) > math.abs(tv_target - v0)) then - --atdebug("hit tv_target ",tv_target,"with v=",v0, "dv=",dv) + atprint("in train_step_b: hit tv_target ",tv_target,"with v=",v0, "dv=",dv) v1 = tv_target tv_effective = true else @@ -544,6 +575,7 @@ function advtrains.train_step_b(id, train, dtime) train.acceleration = (v1 - v0) / dtime train.velocity = v1 + atprint("in train_step_b: New velocity",v1," (yields acceleration",train.acceleration,")") --- 4. move train --- -- if we have calculated the new end index before, don't do that again @@ -552,17 +584,20 @@ function advtrains.train_step_b(id, train, dtime) local dst_curr_v = v1 * dtime train.dist_moved_this_step = dst_curr_v new_index_curr_tv = advtrains.path_get_index_by_offset(train, train.index, dst_curr_v) + atprint("in train_step_b: movement calculation (re)done, yields newindex=",new_index_curr_tv) + else + atprint("in train_step_b: movement calculation reusing from LZB newindex=",new_index_curr_tv) end -- if the zeroappr mechanism has hit, go no further than zeroappr index if lzb_next_zero_barrier and new_index_curr_tv > lzb_next_zero_barrier then - --atdebug("zeroappr hitcond newidx_tv=",new_index_curr_tv, "za_idx=",lzb_zeroappr_target_index) + atprint("in train_step_b: Zero barrier hit, clipping to newidx_tv=",new_index_curr_tv, "zb_idx=",lzb_next_zero_barrier) new_index_curr_tv = lzb_next_zero_barrier end train.index = new_index_curr_tv recalc_end_index(train) - + atprint("in train_step_b: New index",train.index,"end",train.end_index,"vel",train.velocity) end function advtrains.train_step_c(id, train, dtime) diff --git a/advtrains_interlocking/approach.lua b/advtrains_interlocking/approach.lua index 14a31ce..9313128 100644 --- a/advtrains_interlocking/approach.lua +++ b/advtrains_interlocking/approach.lua @@ -21,6 +21,10 @@ local function get_over_function(speed, shunt) -- Set train 1 index backward. Hope this does not lead to bugs... --train.index = index - 0.5 train.speed_restriction = 0 + + --TODO temporary + advtrains.drb_dump(id) + error("Debug: "..id.." triggered LZB-0") else train.speed_restriction = speed train.is_shunt = shunt diff --git a/advtrains_luaautomation/active_common.lua b/advtrains_luaautomation/active_common.lua index 7db3eaf..d3985dc 100644 --- a/advtrains_luaautomation/active_common.lua +++ b/advtrains_luaautomation/active_common.lua @@ -150,6 +150,11 @@ function ac.run_in_env(pos, evtdata, customfct_p) if meta then meta:set_string("infotext", "LuaAutomation ATC interface rail, ERROR:"..dataout) end + --TODO temporary + --if customfct.atc_id then + -- advtrains.drb_dump(customfct.atc_id) + -- error("Debug: LuaATC error hit!") + --end end if meta then meta:set_string("formspec", ac.getform(pos, meta)) |