Commit 16bbde85 authored by Alexander David Hellwig's avatar Alexander David Hellwig
Browse files

Model: renaming

parent 35e5b573
...@@ -6,8 +6,8 @@ component FirstLineIntersection<N1 m1 = 9, N1 m2 = 45>{ ...@@ -6,8 +6,8 @@ component FirstLineIntersection<N1 m1 = 9, N1 m2 = 45>{
in Q^{2,1} pointsIn[m2], in Q^{2,1} pointsIn[m2],
out B collisionOut, out B collisionOut,
out Z linexA, out Z lIndexA,
out Z linexB, out Z lIndexB,
out Q^{2,1} pos; out Q^{2,1} pos;
//TODO: bug: must not always be earliest crash pos //TODO: bug: must not always be earliest crash pos
...@@ -20,8 +20,8 @@ component FirstLineIntersection<N1 m1 = 9, N1 m2 = 45>{ ...@@ -20,8 +20,8 @@ component FirstLineIntersection<N1 m1 = 9, N1 m2 = 45>{
for j = i:m1 for j = i:m1
if found == false if found == false
if collisionIn(k) if collisionIn(k)
linexA = i; lIndexA = i;
linexB = j; lIndexB = j;
pos = pointsIn(k); pos = pointsIn(k);
found = true; found = true;
end end
......
...@@ -26,8 +26,8 @@ component TrajectoryCollision<N1 m = 10, N1 m1 = 9, N1 m2 = 45>{ ...@@ -26,8 +26,8 @@ component TrajectoryCollision<N1 m = 10, N1 m1 = 9, N1 m2 = 45>{
connect lineIntersection[:].point -> firstLineIntersection.pointsIn[:]; connect lineIntersection[:].point -> firstLineIntersection.pointsIn[:];
connect firstLineIntersection.collisionOut -> timeCutoffFilter.collisionIn; connect firstLineIntersection.collisionOut -> timeCutoffFilter.collisionIn;
connect firstLineIntersection.linexA -> timeCutoffFilter.indexInA; connect firstLineIntersection.lIndexA -> timeCutoffFilter.indexInA;
connect firstLineIntersection.linexB -> timeCutoffFilter.indexInB; connect firstLineIntersection.lIndexB -> timeCutoffFilter.indexInB;
connect firstLineIntersection.pos -> timeCutoffFilter.colPosIn; connect firstLineIntersection.pos -> timeCutoffFilter.colPosIn;
connect trajectoryA -> timeCutoffFilter.trajectoryInA; connect trajectoryA -> timeCutoffFilter.trajectoryInA;
connect trajectoryB -> timeCutoffFilter.trajectoryInB; connect trajectoryB -> timeCutoffFilter.trajectoryInB;
......
...@@ -7,7 +7,7 @@ component TrajectoryToLines<N1 m = 10, N1 m1 = 9>{ ...@@ -7,7 +7,7 @@ component TrajectoryToLines<N1 m = 10, N1 m1 = 9>{
implementation Math{ implementation Math{
for i = 1:m1 for i = 1:m1
Q^{4,1} tmpLine; Q^{4} tmpLine;
tmpLine(1,1) = trajectoryIn(1,i); tmpLine(1,1) = trajectoryIn(1,i);
tmpLine(2,1) = trajectoryIn(2,i); tmpLine(2,1) = trajectoryIn(2,i);
tmpLine(3,1) = trajectoryIn(1,i+1); 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