Code

[WIP] Working merge#117

Code

Open

hmzh-khn wants to merge 35 commits intomainCLeARoboticsLab/StackelbergLeadershipFiltering:mainfrom working-mergeCLeARoboticsLab/StackelbergLeadershipFiltering:working-mergeCopy head branch name to clipboard

+965-71

Commits

Commits on Sep 9, 2023

• Implement merging

  hmzh-khn

  committed
  cde719b

  Copy full SHA for cde719b

• tweaks

  hmzh-khn

  committed
  88ce296

  Copy full SHA for 88ce296

• merging traj

  hmzh-khn

  committed
  8738b19

  Copy full SHA for 8738b19

• straighten reference

  hmzh-khn

  committed
  17877f5

  Copy full SHA for 17877f5

• straighten reference 2

  hmzh-khn

  committed
  e3cf126

  Copy full SHA for e3cf126

• try region 2 position cost to 0m

  hmzh-khn

  committed
  58b09b3

  Copy full SHA for 58b09b3

• increase collision boundary

  hmzh-khn

  committed
  a101968

  Copy full SHA for a101968

Commits on Sep 10, 2023

• change LF R from 5R to 2R

  hmzh-khn

  committed
  013875c

  Copy full SHA for 013875c

• minor changes

  hmzh-khn

  committed
  daa2d49

  Copy full SHA for daa2d49

• Merge branch 'hmzh/merging' of github.com:CLeARoboticsLab/StackelbergControlHypothesesFiltering into hmzh/merging

  hmzh-khn

  committed
  7dd5192

  Copy full SHA for 7dd5192

• reduce LF R term to 1

  hmzh-khn

  committed
  ab7e62f

  Copy full SHA for ab7e62f

• minor changes 2

  hmzh-khn

  committed
  e07d8fe

  Copy full SHA for e07d8fe

• small changes

  hmzh-khn

  committed
  070cf9f

  Copy full SHA for 070cf9f

• Merge branch 'hmzh/merging' of github.com:CLeARoboticsLab/StackelbergControlHypothesesFiltering into hmzh/merging

  hmzh-khn

  committed
  c5cf098

  Copy full SHA for c5cf098

• small changes 4

  hmzh-khn

  committed
  8d7b0ab

  Copy full SHA for 8d7b0ab

• more particles 50 -> 100

  hmzh-khn

  committed
  50934e3

  Copy full SHA for 50934e3

• reduce proc noise, try removing barrier

  hmzh-khn

  committed
  e294ee4

  Copy full SHA for e294ee4

• change traj

  hmzh-khn

  committed
  9e844c6

  Copy full SHA for 9e844c6

• change Ts

  hmzh-khn

  committed
  96c1797

  Copy full SHA for 96c1797

• introduce stay ahead cost

  hmzh-khn

  committed
  638a00c

  Copy full SHA for 638a00c

• fics stay ahead bug

  hmzh-khn

  committed
  35e133b

  Copy full SHA for 35e133b

Commits on Sep 11, 2023

• Ts=25->20, change trajectories to start from same place and nearly collide

  hmzh-khn

  committed
  637de4c

  Copy full SHA for 637de4c

• Ts=25->20, change trajectories to start from same place and nearly collide, p2

  hmzh-khn

  committed
  42df995

  Copy full SHA for 42df995

• Try a SLIQGames generated traj

  hmzh-khn

  committed
  2961638

  Copy full SHA for 2961638

• remove SILQGames GT

  hmzh-khn

  committed
  9e131c1

  Copy full SHA for 9e131c1

• make p2 go first

  hmzh-khn

  committed
  93c6aea

  Copy full SHA for 93c6aea

• remove cost for p1 to be ahead

  hmzh-khn

  committed
  8b6d98d

  Copy full SHA for 8b6d98d

• remove y-pos costing

  hmzh-khn

  committed
  e6ed090

  Copy full SHA for e6ed090

• Reintroduce y-pos costing and swap reverse merge y goals

  hmzh-khn

  committed
  4f0f46d

  Copy full SHA for 4f0f46d

• move goals into GT utils, fix reverse merge scenario

  hmzh-khn

  committed
  51fe144

  Copy full SHA for 51fe144

• introduce flipped merge scenario with p2 in front

  hmzh-khn

  committed
  cd18674

  Copy full SHA for cd18674

Commits on Sep 13, 2023

• passing arg

  hmzh-khn

  committed
  fe42a35

  Copy full SHA for fe42a35

Commits on Sep 14, 2023

• uncomment

  hmzh-khn

  committed
  107111b

  Copy full SHA for 107111b

• fix arg

  hmzh-khn

  committed
  1745fa5

  Copy full SHA for 1745fa5

• some more changes for regenerating

  hmzh-khn

  committed
  2506bcd

  Copy full SHA for 2506bcd