move functions

Author: dehann

src/Common.jl

@@ -0,0 +1,77 @@
+
+export sortVarNested
+
+"""
+    $(SIGNATURES)
+Test if all elements of the string is a number:  Ex, "123" is true, "1_2" is false.
+"""
+allnums(str::S) where {S <: AbstractString} = occursin(Regex(string(["[0-9]" for j in 1:length(str)]...)), str)
+# occursin(r"_+|,+|-+", node_idx)
+
+isnestednum(str::S; delim='_') where {S <: AbstractString} = occursin(Regex("[0-9]+$(delim)[0-9]+"), str)
+
+function sortnestedperm(strs::Vector{<:AbstractString}; delim='_')
+  str12 = split.(strs, delim)
+  sp1 = sortperm(parse.(Int,getindex.(str12,2)))
+  sp2 = sortperm(parse.(Int,getindex.(str12,1)[sp1]))
+  return sp1[sp2]
+end
+
+function getFirstNumericalOffset(st::AS) where AS <: AbstractString
+  i = 1
+  while !allnums(st[i:i])  i+=1; end
+  return i
+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

src/DistributedFactorGraphs.jl

@@ -32,6 +32,7 @@ include("services/AbstractDFG.jl")
 include("services/DFGVariable.jl")
 
 # not sure where to put
+include("Common.jl")
 include("NeedsAHome.jl")
 
 end

src/services/GraphsDFG.jl

@@ -34,7 +34,6 @@ 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!
@@ -362,82 +361,6 @@ Checks if the graph is not fully connected, returns true if it is not contiguous
 hasOrphans(dfg::GraphsDFG)::Bool = !isFullyConnected(dfg)
 
 
-"""
-    $(SIGNATURES)
-Test if all elements of the string is a number:  Ex, "123" is true, "1_2" is false.
-"""
-allnums(str::S) where {S <: AbstractString} = occursin(Regex(string(["[0-9]" for j in 1:length(str)]...)), str)
-# occursin(r"_+|,+|-+", node_idx)
-
-isnestednum(str::S; delim='_') where {S <: AbstractString} = occursin(Regex("[0-9]+$(delim)[0-9]+"), str)
-
-function sortnestedperm(strs::Vector{<:AbstractString}; delim='_')
-  str12 = split.(strs, delim)
-  sp1 = sortperm(parse.(Int,getindex.(str12,2)))
-  sp2 = sortperm(parse.(Int,getindex.(str12,1)[sp1]))
-  return sp1[sp2]
-end
-
-function getFirstNumericalOffset(st::AS) where AS <: AbstractString
-  i = 1
-  while !allnums(st[i:i])  i+=1; end
-  return i
-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
-
-
 """
     $(SIGNATURES)
 Retrieve a list of labels of the immediate neighbors around a given variable or factor.