add label sorting function

Author: dehann

src/services/GraphsDFG.jl

@@ -34,6 +34,7 @@ export getLabelDict, getDescription, setDescription, getInnerGraph, getAddHistor
 export getAddHistory, getDescription, getLabelDict
 export addVariable!, addFactor!
 export ls, lsf, getVariables, getFactors, getVariableIds, getFactorIds
+export sortVarNested
 export getVariable, getFactor
 export updateVariable!, updateFactor!
 export deleteVariable!, deleteFactor!
@@ -377,17 +378,58 @@ function sortnestedperm(strs::Vector{<:AbstractString}; delim='_')
   return sp1[sp2]
 end
 
-# function sortVariableLabels(usl::Vector{Symbol})::Vector{Symbol}
-# 	# x, l = String[], String[]
-# 	# xval = Int[]
-# 	# xstr = String[]
-# 	# xvalnested = String[]
-# 	# xstrnested = String[]
-# 	# canparse1 = true
-# 	# nestedparse1 = true
-# 	# idx = 0
-#
-# end
+"""
+    $SIGNATURES
+
+Sort a variable list which may have nested structure such as `:x1_2` -- does not sort for alphabetic characters.
+"""
+function sortVarNested(vars::Vector{Symbol})::Vector{Symbol}
+	# whos nested and first numeric character offset
+	sv = string.(vars)
+	offsets = getFirstNumericalOffset.(sv)
+	masknested = isnestednum.(sv)
+	masknotnested = true .⊻ masknested
+
+	# strip alphabetic characters from front
+	msv = sv[masknotnested]
+	msvO = offsets[masknotnested]
+	nsv = sv[masknested]
+	nsvO = offsets[masknested]
+
+	# do nonnested list separately
+	nnreducelist = map((s,o) -> s[o:end], msv, msvO)
+	nnintlist = parse.(Int, nnreducelist)
+	nnp = sortperm(nnintlist)
+	nnNums = nnintlist[nnp] # used in mixing later
+	nonnested = msv[nnp]
+	smsv = vars[masknotnested][nnp]
+
+	# do nested list separately
+	nestedreducelist = map((s,o) -> s[o:end], nsv, nsvO)
+	nestedp = sortnestedperm(nestedreducelist)
+	nesNums = parse.(Int, getindex.(split.(nestedreducelist[nestedp], '_'),1)) # used in mixing later
+	nested = nsv[nestedp]
+	snsv = vars[masknested][nestedp]
+
+	# mix back together, pick next sorted item from either pile
+	retvars = Vector{Symbol}(undef, length(vars))
+	nni = 1
+	nesi = 1
+	lsmsv = length(smsv)
+	lsnsv = length(snsv)
+	MAXMAX = 999999999999
+	for i in 1:length(vars)
+	  # inner ifs to ensure bounds and correct sorting at end of each list
+	  if (nni<=lsmsv ? nnNums[nni] : MAXMAX) <= (nesi<=lsnsv ? nesNums[nesi] : MAXMAX)
+	    retvars[i] = smsv[nni]
+		nni += 1
+	  else
+		retvars[i] = snsv[nesi]
+		nesi += 1
+	  end
+	end
+	return retvars
+end
 
 
 """