Fixed tree_navigation - assume root cannot be first parent

rdspring1 · rdspring1 · commit 5f973766a163 · 2015-04-01T08:00:53.000-05:00
diff --git a/project_demos/src/tree_navigation.c b/project_demos/src/tree_navigation.c
@@ -164,16 +164,13 @@ void self_stabilizing_tree(void* parameters)
 				if(parentNbrList.nbrs[i]->ID == rootID)
 				{
 					index = i;
+					nav = FALSE;
 				}
 			}
 
 			if(size > 0)
 			{
 				behMoveToNbr(&behOutput, parentNbrList.nbrs[index] , MOTION_TV);
-				if(index != 0)
-				{
-					nav = FALSE;
-				}
 			}
 		}
 		neighborsPutMutex();
diff --git a/psets/PS3-CProgramming/tree_navigation.c b/psets/PS3-CProgramming/tree_navigation.c
@@ -164,16 +164,13 @@ void self_stabilizing_tree(void* parameters)
 				if(parentNbrList.nbrs[i]->ID == rootID)
 				{
 					index = i;
+					nav = FALSE;
 				}
 			}
 
 			if(size > 0)
 			{
 				behMoveToNbr(&behOutput, parentNbrList.nbrs[index] , MOTION_TV);
-				if(index != 0)
-				{
-					nav = FALSE;
-				}
 			}
 		}
 		neighborsPutMutex();

Original file line number	Diff line number	Diff line change
`@@ -164,16 +164,13 @@ void self_stabilizing_tree(void* parameters)`
`164`	`164`	`if(parentNbrList.nbrs[i]->ID == rootID)`
`165`	`165`	`{`
`166`	`166`	`index = i;`
	`167`	`+ nav = FALSE;`
`167`	`168`	`}`
`168`	`169`	`}`
`169`	`170`
`170`	`171`	`if(size > 0)`
`171`	`172`	`{`
`172`	`173`	`behMoveToNbr(&behOutput, parentNbrList.nbrs[index] , MOTION_TV);`
`173`		`- if(index != 0)`
`174`		`- {`
`175`		`- nav = FALSE;`
`176`		`- }`
`177`	`174`	`}`
`178`	`175`	`}`
`179`	`176`	`neighborsPutMutex();`