EMAM: intersection: set standard generics to n=2, x=1, m=5

parent 0b9d8a83
......@@ -2,7 +2,7 @@ package ba.intersection;
//TODO: x = (n-1)n/2
//TODO: units
component ConflictComputer<N1 n = 4,N1 x = 6,N1 m = 5>{
component ConflictComputer<N1 n = 2,N1 x = 1,N1 m = 5>{
port in Q^{3,m} trajectory[n];
port in Q cutoffPosIn,in Q cutoffTimeIn;
port out B conflictOut[x];
......
package ba.intersection;
//TODO: x = (n-1)n/2
component ConflictToStopConverter<N1 n = 2,N1 x = 3,N1 m = 5>{
component ConflictToStopConverter<N1 n = 2,N1 x = 1,N1 m = 5>{
port in Z(1:n) indexLookupIn[x];
port in B conflictIn[x];
port out B stopOut[n];
......
......@@ -2,7 +2,7 @@ package ba.intersection;
//TODO: rename
//TODO: automatically calculate x: x = (n-1)n/2
component ConflictToStopLookup<N1 n = 2,N1 x = 3>{
component ConflictToStopLookup<N1 n = 2,N1 x = 1>{
port out Z(1:n) indexLookup[x];
......
......@@ -2,7 +2,7 @@ package ba.intersection;
//TODO: x = (n-1)n/2
//n: number of Trajectories, m = number of (x,y,dt) per trajectory
component DeltaTrajectoryComputer<N1 n = 2, N1 x = 3,N1 m = 5>{
component DeltaTrajectoryComputer<N1 n = 2, N1 x = 1,N1 m = 5>{
port in Q(-oo:oo)^{3,m} trajectoryIn[n];
port in Q(-oo:oo)^{3,m} deltaTrajectoryOut[x];
......
package ba.intersection;
//TODO: x = (n-1)n/2
component TrajectoryToStop<N1 n = 4,N1 x = 6,N1 m = 5>{
component TrajectoryToStop<N1 n = 2,N1 x = 1,N1 m = 5>{
port in Q^{3,m} trajectoryIn[n];
port in Q cutoffPos;
port in Q cutoffTime;
......
package ba.util;
component RelToAbsTrajectory<N1 n = 4, N1 m = 5>{
component RelToAbsTrajectory<N1 n = 2, N1 m = 5>{
port in Q^{3,m} relTrajectoryIn[n];
port in Q^{2,1} absPositionIn[n];
port out Q^{3,m} absTrajectoryOut[n];
......
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