Removes reference to branch in progress.go

Author: grussorusso

internal/workflow/progress.go

@@ -39,7 +39,6 @@ type TaskInfo struct {
 	Type   TaskType
 	Status TaskStatus
 	Group  int // The group helps represent the order of execution of nodes. Nodes with the same group should run concurrently
-	Branch int // copied from task
 }
 
 func newTaskInfo(task Task, group int) *TaskInfo {
@@ -52,7 +51,7 @@ func newTaskInfo(task Task, group int) *TaskInfo {
 }
 
 func (ni *TaskInfo) Equals(ni2 *TaskInfo) bool {
-	return ni.Id == ni2.Id && ni.Type == ni2.Type && ni.Status == ni2.Status && ni.Group == ni2.Group && ni.Branch == ni2.Branch
+	return ni.Id == ni2.Id && ni.Type == ni2.Type && ni.Status == ni2.Status && ni.Group == ni2.Group
 }
 
 type TaskStatus string
@@ -303,8 +302,8 @@ func InitProgressRecursive(reqId ReqId, workflow *Workflow) *Progress {
 	}
 }
 
-// popMinGroupAndBranchNode removes the node with minimum group and, in case of multiple nodes in the same group, minimum branch
-func popMinGroupAndBranchNode(infos *[]*TaskInfo) *TaskInfo {
+// popMinGroupNode removes a node with minimum group
+func popMinGroupNode(infos *[]*TaskInfo) *TaskInfo {
 	// finding min group nodes
 	minGroup := math.MaxInt
 	var minGroupNodeInfo []*TaskInfo
@@ -318,16 +317,8 @@ func popMinGroupAndBranchNode(infos *[]*TaskInfo) *TaskInfo {
 			minGroupNodeInfo = append(minGroupNodeInfo, info)
 		}
 	}
-	minBranch := math.MaxInt // when there are ties
-	var minGroupAndBranchNode *TaskInfo
 
-	// finding min branch node from those of the minimum group
-	for _, info := range minGroupNodeInfo {
-		if info.Branch < minBranch {
-			minBranch = info.Branch
-			minGroupAndBranchNode = info
-		}
-	}
+	var minGroupAndBranchNode *TaskInfo = minGroupNodeInfo[0]
 
 	// finding index to remove from starting list
 	var indexToRemove int
@@ -344,7 +335,7 @@ func popMinGroupAndBranchNode(infos *[]*TaskInfo) *TaskInfo {
 func reorder(infos []*TaskInfo) []*TaskInfo {
 	reordered := make([]*TaskInfo, 0)
 	for len(infos) > 0 {
-		next := popMinGroupAndBranchNode(&infos)
+		next := popMinGroupNode(&infos)
 		reordered = append(reordered, next)
 	}
 	return reordered
@@ -429,10 +420,10 @@ func (p *Progress) Print() {
 
 func (p *Progress) PrettyString() string {
 	str := fmt.Sprintf("\nProgress for workflow request %s - G = node group, B = node branch\n", p.ReqId)
-	str += fmt.Sprintln("G. |B| Type   (        NodeID        ) - Status")
+	str += fmt.Sprintln("G. Type   (        NodeID        ) - Status")
 	str += fmt.Sprintln("-------------------------------------------------")
 	for _, info := range p.TaskInfos {
-		str += fmt.Sprintf("%d. |%d| %-6s (%-22s) - %s\n", info.Group, info.Branch, printType(info.Type), info.Id, printStatus(info.Status))
+		str += fmt.Sprintf("%d. %-6s (%-22s) - %s\n", info.Group, printType(info.Type), info.Id, printStatus(info.Status))
 	}
 	return str
 }

internal/workflow/task.go

@@ -31,8 +31,6 @@ type HasOutput interface {
 }
 
 // TODO: GetNext() should be differentiated for the case of single vs multiple successor nodes
-// TODO: check the implementation in ChoiceNode, where it returns a different next task depending on the execution state
-// TODO: check also FanOut
 type HasNext interface {
 	GetNext() []TaskId
 }