Merge branch 'master' into maint/20Q3/datablob_concepts

Author: Affie

.travis.yml

@@ -21,7 +21,7 @@ branches:
   only:
   - master
   - develop
-  - /^release-.*$/
+  - /^release.*$/
 
 jobs:
   include:

Project.toml

@@ -19,8 +19,8 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
-UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 Unmarshal = "cbff2730-442d-58d7-89d1-8e530c41eb02"
+UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 Colors = "0.8, 0.9, 0.10, 0.11, 0.12"

README.md

@@ -2,7 +2,7 @@
 
 Release v0.8 | Release v0.9 | Dev | Coverage | DFG Docs | Caesar Docs |
 ---------|---------|-----|----------|------|------------
-[![Build Status](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl.svg?branch=release/v0.8)](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl) | [![Build Status](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl.svg?branch=release/v0.9)](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl) |  [![Build Status](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl.svg?branch=master)](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl) | [![Codecov Status](https://codecov.io/gh/JuliaRobotics/DistributedFactorGraphs.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaRobotics/DistributedFactorGraphs.jl) | [![docs](https://img.shields.io/badge/docs-latest-blue.svg)](http://juliarobotics.github.io/DistributedFactorGraphs.jl/latest/) | [![docs](https://img.shields.io/badge/docs-latest-blue.svg)](http://juliarobotics.github.io/Caesar.jl/latest/)
+[![Build Status](https://api.travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl.svg?branch=release/v0.8)](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl) | [![Build Status](https://api.travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl.svg?branch=release/v0.9)](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl) |  [![Build Status](https://api.travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl.svg?branch=master)](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl) | [![Codecov Status](https://codecov.io/gh/JuliaRobotics/DistributedFactorGraphs.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaRobotics/DistributedFactorGraphs.jl) | [![docs](https://img.shields.io/badge/docs-latest-blue.svg)](http://juliarobotics.github.io/DistributedFactorGraphs.jl/latest/) | [![docs](https://img.shields.io/badge/docs-latest-blue.svg)](http://juliarobotics.github.io/Caesar.jl/latest/)
 
 DistributedFactorGraphs.jl provides a flexible factor graph API for use in the [Caesar.jl](https://github.com/JuliaRobotics/Caesar.jl) ecosystem. The package supplies:
 * A standardized API for interacting with factor graphs

src/CloudGraphsDFG/CloudGraphsDFG.jl

@@ -20,6 +20,7 @@ import ...DistributedFactorGraphs:  setSolverParams!,
                                     exists,
                                     isVariable,
                                     isFactor,
+                                    getSofttype,
                                     getDescription,
                                     updateVariable!,
                                     updateFactor!,
@@ -59,6 +60,7 @@ import ...DistributedFactorGraphs:  setSolverParams!,
                                     mergeTags!,
                                     removeTags!,
                                     emptyTags!,
+                                    listVariableSolverData,
                                     addVariableSolverData!,
                                     updateVariableSolverData!,
                                     deleteVariableSolverData!,
@@ -69,17 +71,19 @@ import ...DistributedFactorGraphs:  setSolverParams!,
                                     listPPEs,
                                     deletePPE!,
                                     updatePPE!,
-                                    packPPE,
-                                    unpackPPE,
                                     getSolvable,
-                                    setSolvable!
+                                    setSolvable!,
+                                    getEstimateFields,
+                                    _getname,
+                                    _getmodule,
+                                    getTypeFromSerializationModule
 
 using Neo4j
 using Base64
 
 using DocStringExtensions
 using Requires
-using Dates
+using Dates, TimeZones
 using Distributions
 using Reexport
 using JSON

src/CloudGraphsDFG/services/CGStructure.jl

@@ -58,6 +58,7 @@ function createUser(dfg::CloudGraphsDFG, user::User)::User
     !isValidLabel(user) && error("Node cannot have an ID '$(user.id)'.")
 
     props = _convertNodeToDict(user)
+    # TODO: Switch to _queryNeo4j
     retNode = _createNode(dfg.neo4jInstance, ["USER", String(user.id)], props, nothing)
     return user
 end
@@ -77,6 +78,7 @@ function createRobot(dfg::CloudGraphsDFG, robot::Robot)::Robot
         error("Robot '$(robot.id)' already exists for user '$(robot.userId)'")
 
     props = _convertNodeToDict(robot)
+    # TODO: Switch to _queryNeo4j
     retNode = _createNode(dfg.neo4jInstance, ["ROBOT", String(robot.userId), String(robot.id)], props, parents[1], :ROBOT)
     return robot
 end
@@ -96,6 +98,7 @@ function createSession(dfg::CloudGraphsDFG, session::Session)::Session
         error("Session '$(session.id)' already exists for robot '$(session.robotId)' and user '$(session.userId)'")
 
     props = _convertNodeToDict(session)
+    # TODO: Switch to _queryNeo4j
     retNode = _createNode(dfg.neo4jInstance, ["SESSION", String(session.userId), String(session.robotId), String(session.id)], props, parents[1], :SESSION)
     return session
 end
@@ -227,7 +230,7 @@ DANGER: Clears the whole session from the database.
 """
 function clearSession!!(dfg::CloudGraphsDFG)::Nothing
     # Perform detach+deletion
-    _getNeoNodesFromCyphonQuery(dfg.neo4jInstance, "(node:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId)) detach delete node ")
+    _queryNeo4j(dfg.neo4jInstance, "match (node:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId)) detach delete node ")
 
     # Clearing history
     dfg.addHistory = Symbol[]
@@ -240,7 +243,7 @@ DANGER: Clears the whole robot + sessions from the database.
 """
 function clearRobot!!(dfg::CloudGraphsDFG)::Nothing
     # Perform detach+deletion
-    _getNeoNodesFromCyphonQuery(dfg.neo4jInstance, "(node:$(dfg.userId):$(dfg.robotId)) detach delete node ")
+    _queryNeo4j(dfg.neo4jInstance, "match (node:$(dfg.userId):$(dfg.robotId)) detach delete node ")
 
     # Clearing history
     dfg.addHistory = Symbol[]
@@ -253,7 +256,7 @@ DANGER: Clears the whole user + robot + sessions from the database.
 """
 function clearUser!!(dfg::CloudGraphsDFG)::Nothing
     # Perform detach+deletion
-    _getNeoNodesFromCyphonQuery(dfg.neo4jInstance, "(node:$(dfg.userId)) detach delete node ")
+    _queryNeo4j(dfg.neo4jInstance, "match (node:$(dfg.userId)) detach delete node ")
 
     # Clearing history
     dfg.addHistory = Symbol[]