Skip to content
Snippets Groups Projects

Hh6chen dijkstras with reverse

Merged Hh6chen dijkstras with reverse
hh6chen-dijkstras-with-reverse into main
Merged Harrison Chen requested to merge hh6chen-dijkstras-with-reverse into main
Viewing commit 0d9b6147
Prev Next
Show latest version
2 files
+ 33
− 7
Compare changes
  • Side-by-side
  • Inline
Files
2
track_info/track_data_b.c
+ 37
− 28
@@ -280,7 +280,7 @@ void init_trackb(track_node* track) {
track[33].type = NODE_SENSOR;
track[33].num = 33;
track[33].reverse = &track[32];
track[33].edge[DIR_AHEAD].reverse = &track[116].edge[DIR_CURVED];
// track[33].edge[DIR_AHEAD].reverse = &track[116].edge[DIR_CURVED];
track[33].edge[DIR_AHEAD].src = &track[33];
track[33].edge[DIR_AHEAD].dest = &track[117];
track[33].edge[DIR_AHEAD].dist = 246;
@@ -528,7 +528,7 @@ void init_trackb(track_node* track) {
track[64].type = NODE_SENSOR;
track[64].num = 64;
track[64].reverse = &track[65];
// track[64].edge[DIR_AHEAD].reverse = &track[122].edge[DIR_CURVED];
track[64].edge[DIR_AHEAD].reverse = &track[122].edge[DIR_CURVED];
track[64].edge[DIR_AHEAD].src = &track[64];
track[64].edge[DIR_AHEAD].dest = &track[123];
track[64].edge[DIR_AHEAD].dist = 239;
@@ -1025,7 +1025,8 @@ void init_trackb(track_node* track) {
track[115].edge[DIR_AHEAD].dest = &track[88];
track[115].edge[DIR_AHEAD].dist = 155;
track[116].name = "BR153";
track[116].type = NODE_BRANCH;
// track[116].type = NODE_BRANCH;
track[116].type = NODE_NONE;
track[116].num = 153;
track[116].reverse = &track[117];
track[116].edge[DIR_STRAIGHT].reverse = &track[124].edge[DIR_AHEAD];
@@ -1036,6 +1037,10 @@ void init_trackb(track_node* track) {
track[116].edge[DIR_CURVED].src = &track[116];
track[116].edge[DIR_CURVED].dest = &track[32];
track[116].edge[DIR_CURVED].dist = 246;
// track[116].edge[DIR_AHEAD].reverse = &track[124].edge[DIR_AHEAD];
// track[116].edge[DIR_AHEAD].src = &track[116];
// track[116].edge[DIR_AHEAD].dest = &track[125];
// track[116].edge[DIR_AHEAD].dist = 253;
track[117].name = "MR153";
track[117].type = NODE_MERGE;
track[117].num = 153;
@@ -1056,6 +1061,10 @@ void init_trackb(track_node* track) {
track[118].edge[DIR_CURVED].src = &track[118];
track[118].edge[DIR_CURVED].dest = &track[29];
track[118].edge[DIR_CURVED].dist = 239;
// track[118].edge[DIR_AHEAD].reverse = &track[28].edge[DIR_AHEAD];
// track[118].edge[DIR_AHEAD].src = &track[118];
// track[118].edge[DIR_AHEAD].dest = &track[29];
// track[118].edge[DIR_AHEAD].dist = 239;
track[119].name = "MR154";
track[119].type = NODE_MERGE;
track[119].num = 154;
@@ -1068,18 +1077,18 @@ void init_trackb(track_node* track) {
track[120].type = NODE_NONE;
track[120].num = 155;
track[120].reverse = &track[121];
// track[120].edge[DIR_STRAIGHT].reverse = &track[126].edge[DIR_AHEAD];
// track[120].edge[DIR_STRAIGHT].src = &track[120];
// track[120].edge[DIR_STRAIGHT].dest = &track[127];
// track[120].edge[DIR_STRAIGHT].dist = 282;
// track[120].edge[DIR_CURVED].reverse = &track[48].edge[DIR_AHEAD];
// track[120].edge[DIR_CURVED].src = &track[120];
// track[120].edge[DIR_CURVED].dest = &track[49];
// track[120].edge[DIR_CURVED].dist = 246;
track[120].edge[DIR_AHEAD].reverse = &track[48].edge[DIR_AHEAD];
track[120].edge[DIR_AHEAD].src = &track[120];
track[120].edge[DIR_AHEAD].dest = &track[49];
track[120].edge[DIR_AHEAD].dist = 246;
track[120].edge[DIR_STRAIGHT].reverse = &track[126].edge[DIR_AHEAD];
track[120].edge[DIR_STRAIGHT].src = &track[120];
track[120].edge[DIR_STRAIGHT].dest = &track[127];
track[120].edge[DIR_STRAIGHT].dist = 282;
track[120].edge[DIR_CURVED].reverse = &track[48].edge[DIR_AHEAD];
track[120].edge[DIR_CURVED].src = &track[120];
track[120].edge[DIR_CURVED].dest = &track[49];
track[120].edge[DIR_CURVED].dist = 246;
// track[120].edge[DIR_AHEAD].reverse = &track[48].edge[DIR_AHEAD];
// track[120].edge[DIR_AHEAD].src = &track[120];
// track[120].edge[DIR_AHEAD].dest = &track[49];
// track[120].edge[DIR_AHEAD].dist = 246;
track[121].name = "MR155";
track[121].type = NODE_MERGE;
track[121].num = 155;
@@ -1092,18 +1101,18 @@ void init_trackb(track_node* track) {
track[122].type = NODE_NONE;
track[122].num = 156;
track[122].reverse = &track[123];
// track[122].edge[DIR_STRAIGHT].reverse = &track[121].edge[DIR_AHEAD];
// track[122].edge[DIR_STRAIGHT].src = &track[122];
// track[122].edge[DIR_STRAIGHT].dest = &track[120];
// track[122].edge[DIR_STRAIGHT].dist = 0;
// track[122].edge[DIR_CURVED].reverse = &track[64].edge[DIR_AHEAD];
// track[122].edge[DIR_CURVED].src = &track[122];
// track[122].edge[DIR_CURVED].dest = &track[65];
// track[122].edge[DIR_CURVED].dist = 239;
track[122].edge[DIR_AHEAD].reverse = &track[121].edge[DIR_AHEAD];
track[122].edge[DIR_AHEAD].src = &track[122];
track[122].edge[DIR_AHEAD].dest = &track[120];
track[122].edge[DIR_AHEAD].dist = 0;
track[122].edge[DIR_STRAIGHT].reverse = &track[121].edge[DIR_AHEAD];
track[122].edge[DIR_STRAIGHT].src = &track[122];
track[122].edge[DIR_STRAIGHT].dest = &track[120];
track[122].edge[DIR_STRAIGHT].dist = 0;
track[122].edge[DIR_CURVED].reverse = &track[64].edge[DIR_AHEAD];
track[122].edge[DIR_CURVED].src = &track[122];
track[122].edge[DIR_CURVED].dest = &track[65];
track[122].edge[DIR_CURVED].dist = 239;
// track[122].edge[DIR_AHEAD].reverse = &track[121].edge[DIR_AHEAD];
// track[122].edge[DIR_AHEAD].src = &track[122];
// track[122].edge[DIR_AHEAD].dest = &track[120];
// track[122].edge[DIR_AHEAD].dist = 0;
track[123].name = "MR156";
track[123].type = NODE_MERGE;
track[123].num = 156;
@@ -1125,7 +1134,7 @@ void init_trackb(track_node* track) {
track[126].name = "EN2";
track[126].type = NODE_ENTER;
track[126].reverse = &track[127];
// track[126].edge[DIR_AHEAD].reverse = &track[120].edge[DIR_STRAIGHT];
track[126].edge[DIR_AHEAD].reverse = &track[120].edge[DIR_STRAIGHT];
track[126].edge[DIR_AHEAD].src = &track[126];
track[126].edge[DIR_AHEAD].dest = &track[121];
track[126].edge[DIR_AHEAD].dist = 282;