Merge branch 'master' of https://github.com/JuliaRobotics/DistributedFactorGraphs.jl into feature/149_DFGVariableSofttype

Author: GearsAD

.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:

Project.toml

@@ -1,8 +1,9 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.4.1"
+version = "0.5.0"
 
 [deps]
+Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
@@ -13,24 +14,25 @@ JSON2 = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
 LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5"
+Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-Distributions = "≥ 0.18"
-DocStringExtensions = "≥ 0.7"
-Graphs = "≥ 0.10.3"
-MetaGraphs = "≥ 0.6.4"
-Reexport = "≥ 0.2"
-Requires = "≥ 0.5"
+Distributions = "0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25, 1"
+DocStringExtensions = "0.7, 0.8, 0.9, 0.10, 1"
+Graphs = "0.10.2, 0.11, 1"
+MetaGraphs = "^0.6.3"
+Neo4j = "2"
+Reexport = "0.2, 0.3, 0.4, 0.5, 1"
+Requires = "0.5, 0.6, 0.7, 0.8, 0.9, 0.10, 1"
 julia = "0.7, 1"
 
 [extras]
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231"
-Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "GraphPlot", "Neo4j", "Pkg"]
+test = ["Test", "GraphPlot", "Pkg"]

README.md

@@ -69,7 +69,7 @@ docker pull neo4j
 To run the image with user `neo4j` and password `test`:
 
 ```bash
-docker run --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/test neo4j
+docker run -d --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/test neo4j
 ```
 
 > **Note** If you just installed docker and having permission issues, please see [this ask Ubuntu forum](https://askubuntu.com/questions/941816/permission-denied-when-running-docker-after-installing-it-as-a-snap).

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/CloudGraphsDFG.jl

@@ -1,23 +1,26 @@
 using Neo4j
+using Base64
 
 # Entities
 include("entities/CloudGraphsDFG.jl")
+include("entities/CGStructure.jl")
 
 # Services
 include("services/CommonFunctions.jl")
+include("services/CGStructure.jl")
 include("services/CloudGraphsDFG.jl")
 
 # Exports
 export Neo4jInstance, CloudGraphsDFG
 export exists
 export clearSession!
-export getLabelDict, getDescription, setDescription, getInnerGraph, getAddHistory, getSolverParams, setSolverParams
+export getLabelDict, getDescription, setDescription, getAddHistory, getSolverParams, setSolverParams
 
 export getAddHistory, getDescription, getLabelDict
 export addVariable!, addFactor!
 export ls, lsf, getVariables, getFactors, getVariableIds, getFactorIds
 export getVariable, getFactor
-export updateVariable!, updateFactor!, updateVariableSolverData!
+export updateVariable!, updateFactor!, mergeUpdateVariableSolverData!
 export deleteVariable!, deleteFactor!
 export getAdjacencyMatrix
 export getNeighbors

src/CloudGraphsDFG/entities/CGStructure.jl

@@ -0,0 +1,34 @@
+# Very simple initial sentinel structure for Graff elements in DFG.
+# TODO: Need to flesh out further in next release.
+
+export User, Robot, Session
+
+abstract type AbstractCGNode
+end
+
+mutable struct User <: AbstractCGNode
+    id::Symbol
+    name::String
+    description::String
+    # labels::Vector{Symbol}
+    data::Dict{Symbol, String}
+end
+
+mutable struct Robot <: AbstractCGNode
+    id::Symbol
+    userId::Symbol
+    name::String
+    description::String
+    # labels::Vector{Symbol}
+    data::Dict{Symbol, String}
+end
+
+mutable struct Session <: AbstractCGNode
+    id::Symbol
+    robotId::Symbol
+    userId::Symbol
+    name::String
+    description::String
+    # labels::Vector{Symbol}
+    data::Dict{Symbol, String}
+end