Model: renaming

parent 35e5b573
......@@ -6,8 +6,8 @@ component FirstLineIntersection<N1 m1 = 9, N1 m2 = 45>{
in Q^{2,1} pointsIn[m2],
out B collisionOut,
out Z linexA,
out Z linexB,
out Z lIndexA,
out Z lIndexB,
out Q^{2,1} pos;
//TODO: bug: must not always be earliest crash pos
......@@ -20,8 +20,8 @@ component FirstLineIntersection<N1 m1 = 9, N1 m2 = 45>{
for j = i:m1
if found == false
if collisionIn(k)
linexA = i;
linexB = j;
lIndexA = i;
lIndexB = j;
pos = pointsIn(k);
found = true;
end
......
......@@ -26,8 +26,8 @@ component TrajectoryCollision<N1 m = 10, N1 m1 = 9, N1 m2 = 45>{
connect lineIntersection[:].point -> firstLineIntersection.pointsIn[:];
connect firstLineIntersection.collisionOut -> timeCutoffFilter.collisionIn;
connect firstLineIntersection.linexA -> timeCutoffFilter.indexInA;
connect firstLineIntersection.linexB -> timeCutoffFilter.indexInB;
connect firstLineIntersection.lIndexA -> timeCutoffFilter.indexInA;
connect firstLineIntersection.lIndexB -> timeCutoffFilter.indexInB;
connect firstLineIntersection.pos -> timeCutoffFilter.colPosIn;
connect trajectoryA -> timeCutoffFilter.trajectoryInA;
connect trajectoryB -> timeCutoffFilter.trajectoryInB;
......
......@@ -7,7 +7,7 @@ component TrajectoryToLines<N1 m = 10, N1 m1 = 9>{
implementation Math{
for i = 1:m1
Q^{4,1} tmpLine;
Q^{4} tmpLine;
tmpLine(1,1) = trajectoryIn(1,i);
tmpLine(2,1) = trajectoryIn(2,i);
tmpLine(3,1) = trajectoryIn(1,i+1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment