Merge branch 'master' into feature/FileDFG_testing

Author: Affie

.travis.yml

@@ -22,23 +22,23 @@ jobs:
   include:
     - julia: 1.2
       env: IIF_TEST=true
+      if: NOT branch =~ ^release.*$
     - stage: "Documentation"
       julia: 1.0
       os: linux
       script:
-        - julia -e 'import Pkg; Pkg.add("Documenter"); Pkg.add("Neo4j"); Pkg.add("GraphPlot")'
-        - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));
-                                               Pkg.instantiate()'
+        - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
         - julia --project=docs/ docs/make.jl
       after_success: skip
+  fast_finish: true
 
 notifications:
     email: false
 
 matrix:
   allow_failures:
   - julia: nightly
-  - env: IIF_TEST=true
+# - env: IIF_TEST=true
 
 # Set the password for Neo4j to neo4j:test
 before_script:

docs/Project.toml

@@ -1,6 +1,5 @@
 [deps]
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 
 [compat]
-Documenter = "~0.21"
+Documenter = "0.23"

docs/make.jl

@@ -1,5 +1,4 @@
 using Documenter
-using DataFrames
 using DistributedFactorGraphs
 
 makedocs(

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

@@ -258,7 +258,7 @@ function getFactor(dfg::CloudGraphsDFG, factorId::Int64)::DFGFactor
     factor = dfg.rebuildFactorMetadata!(dfg, factor)
     # GUARANTEED never to bite us in the future...
     # ... TODO: refactor if changed: https://github.com/JuliaRobotics/IncrementalInference.jl/issues/350
-    getData(factor).fncargvID = _variableOrderSymbols
+    solverData(factor).fncargvID = _variableOrderSymbols
 
     # Add to cache
     push!(dfg.factorCache, factor.label=>factor)

src/FileDFG/services/FileDFG.jl

@@ -71,7 +71,7 @@ function loadDFG(folder::String, iifModule, dfgLoadInto::G) where G <: AbstractD
     # PATCH - To update the fncargvID for factors, it's being cleared somewhere in rebuildFactorMetadata.
     # TEMPORARY
     # TODO: Remove in future
-    map(f->getData(f).fncargvID = f._variableOrderSymbols, getFactors(dfgLoadInto))
+    map(f->solverData(f).fncargvID = f._variableOrderSymbols, getFactors(dfgLoadInto))
 
     return dfgLoadInto
 end

src/services/AbstractDFG.jl

@@ -547,7 +547,7 @@ isFactor(dfg::G, sym::Symbol) where G <: AbstractDFG = hasFactor(dfg, sym)
 Return reference to the user factor in `<:AbstractDFG` identified by `::Symbol`.
 """
 getFactorFunction(fcd::GenericFunctionNodeData) = fcd.fnc.usrfnc!
-getFactorFunction(fc::DFGFactor) = getFactorFunction(getData(fc))
+getFactorFunction(fc::DFGFactor) = getFactorFunction(solverData(fc))
 function getFactorFunction(dfg::G, fsym::Symbol) where G <: AbstractDFG
   getFactorFunction(getFactor(dfg, fsym))
 end