diff options
author | ywang <yw05@forksworld.de> | 2019-12-07 16:48:19 +0100 |
---|---|---|
committer | ywang <yw05@forksworld.de> | 2019-12-07 16:48:19 +0100 |
commit | a404f83ebb6aa26b16e56debc2d6d86f52df680e (patch) | |
tree | a9b368598609793a6a2f5bf44cf1c04449ab55c7 /advtrains/trainlogic.lua | |
parent | 45f5406e7ebf22f0c2594c8e8a4e734cc23479b7 (diff) | |
download | advtrains-a404f83ebb6aa26b16e56debc2d6d86f52df680e.tar.gz advtrains-a404f83ebb6aa26b16e56debc2d6d86f52df680e.tar.bz2 advtrains-a404f83ebb6aa26b16e56debc2d6d86f52df680e.zip |
Improved quadratic function solver; added wrapper for math.sqrt()
Diffstat (limited to 'advtrains/trainlogic.lua')
-rw-r--r-- | advtrains/trainlogic.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/advtrains/trainlogic.lua b/advtrains/trainlogic.lua index 5f340ac..441a11a 100644 --- a/advtrains/trainlogic.lua +++ b/advtrains/trainlogic.lua @@ -433,7 +433,7 @@ function advtrains.train_step_b(id, train, dtime) else s = (v1*v1 - v0*v0)/2/a end train.ctrl.lzb = nil - if lzblimit.velocity and lzblimit.velocity < train.velocity then + if lzblimit.velocity and lzblimit.lever < train.lever then tmp_lever = lzblimit.lever while (lzbmap[tmp_lever].t > dtime) do tmp_lever = tmp_lever - 1 @@ -456,7 +456,7 @@ function advtrains.train_step_b(id, train, dtime) a = (v1 - train.velocity)/dtime --- 4b. Move train and update train properties --- local pdist = train.path_dist[math.floor(train.index)] or 1 - local distance = s / pdist + local distance = pdist == 0 and s or s / pdist train.lever = tmp_lever train.velocity = v1 train.acceleration = a |