fixes

Author: dehann

src/entities/DFGVariable.jl

@@ -278,6 +278,29 @@ TODO, DO NOT USE v.softtypename in DFGVariableSummary
 """
 getSofttype(v::DFGVariableSummary)::Symbol = v.softtypename
 
+
+"""
+    $SIGNATURES
+
+Retrieve solver data structure stored in a variable.
+"""
+solverData(v::DFGVariable, key::Symbol=:default) = haskey(v.solverDataDict, key) ? v.solverDataDict[key] : nothing
+
+
+"""
+    $SIGNATURES
+
+Set solver data structure stored in a variable.
+"""
+setSolverData!(v::DFGVariable, data::VariableNodeData, key::Symbol=:default) = v.solverDataDict[key] = data
+
+"""
+    $SIGNATURES
+
+Get solver data dictionary for a variable.
+"""
+solverDataDict(v::DFGVariable) = v.solverDataDict
+
 """
     $SIGNATURES
 
@@ -294,13 +317,13 @@ getSolved(dfg::AbstractDFG, sym::Symbol, solveKey::Symbol=:default) = getSolved(
 """
     $SIGNATURES
 
-Boolena on whether the variable has been solved.
+Boolean on whether the variable has been solved.
 
 Related
 
 getSolved, setSolved!
 """
-isSolved(v::VariableNodeData) = v.solveCount
+isSolved(v::VariableNodeData) = v.solvedCount
 isSolved(v::VariableDataLevel2, solveKey::Symbol=:default) = solverData(v, solveKey) |> isSolved
 isSolved(dfg::AbstractDFG, sym::Symbol, solveKey::Symbol=:default) = isSolved(getVariable(dfg, sym), solveKey)
 
@@ -314,34 +337,10 @@ Related
 
 getSolved, isSolved
 """
-# setSolved!(v::VariableDataLevel2, val::Int) = v.solveCount[] = val
-# setSolved!(dfg::AbstractDFG, sym::Symbol, val::Int solveKey::Symbol=:default) = setSolved!(solverData(getVariable(dfg, sym), solveKey), val)
-
-setSolved!(v::VariableNodeData, val::Int) = v.solveCount = val
+setSolved!(v::VariableNodeData, val::Int) = v.solvedCount = val
 setSolved!(v::VariableDataLevel2, val::Int, solveKey::Symbol=:default) = setSolved!(solverData(v, solveKey), val)
 setSolved!(dfg::AbstractDFG, sym::Symbol, val::Int, solveKey::Symbol=:default) = setSolved!(getVariable(dfg, sym), solveKey, val)
 
-"""
-    $SIGNATURES
-
-Retrieve solver data structure stored in a variable.
-"""
-solverData(v::DFGVariable, key::Symbol=:default) = haskey(v.solverDataDict, key) ? v.solverDataDict[key] : nothing
-
-
-"""
-    $SIGNATURES
-
-Set solver data structure stored in a variable.
-"""
-setSolverData!(v::DFGVariable, data::VariableNodeData, key::Symbol=:default) = v.solverDataDict[key] = data
-
-"""
-    $SIGNATURES
-
-Get solver data dictionary for a variable.
-"""
-solverDataDict(v::DFGVariable) = v.solverDataDict
 
 """
 $SIGNATURES