Merge pull request #291 from JuliaRobotics/dev/dfg06

Development updates for DFG v0.6

Author: Affie

.travis.yml

@@ -7,7 +7,6 @@ os:
 
 arch:
     - amd64
-    - arm64
 
 services:
     - neo4j
@@ -26,6 +25,7 @@ jobs:
     - julia: 1.2
       env: IIF_TEST=true
       if: NOT branch =~ ^release.*$
+    - arch: arm64
     - stage: "Documentation"
       julia: 1.2
       os: linux
@@ -50,4 +50,4 @@ before_script:
     - curl -v POST http://neo4j:neo4j@localhost:7474/user/neo4j/password -d"password=test"
 
 after_success:
-    - julia -e 'using Pkg; cd(Pkg.dir("DistributedFactorGraphs")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder()); Coveralls.submit(process_folder())'
+    - julia -e 'using Pkg; cd(Pkg.dir("DistributedFactorGraphs")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

Project.toml

@@ -1,6 +1,6 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.5.4"
+version = "0.6.0"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -21,7 +21,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 [compat]
 Colors = "0.8, 0.9, 0.10, 0.11"
 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"
+DocStringExtensions = "0.8, 0.9, 0.10, 1"
 GraphPlot = "0.3.1, 0.4"
 Graphs = "0.10.2, 0.11, 1"
 JSON2 = "0.3.1"

README.md

@@ -2,7 +2,7 @@
 
 Release | Dev | Coverage | Docs
 ---------|-----|----------|------
-[![Build Status](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl.svg?branch=release/v0.5)](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) [![Coverage Status](https://img.shields.io/coveralls/JuliaRobotics/DistributedFactorGraphs.jl.svg)](https://coveralls.io/r/JuliaRobotics/DistributedFactorGraphs.jl?branch=master) | [![docs](https://img.shields.io/badge/docs-latest-blue.svg)](http://juliarobotics.github.io/DistributedFactorGraphs.jl/latest/)
+[![Build Status](https://travis-ci.org/JuliaRobotics/DistributedFactorGraphs.jl.svg?branch=release/v0.5)](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/)
 
 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/attic/MetaGraphsDFG/DFGPlots.jl renamed to attic/MetaGraphsDFG/DFGPlots.jl

@@ -18,7 +18,7 @@ export ls, lsf, getVariables, getFactors, getVariableIds, getFactorIds
 export getVariable, getFactor
 export updateVariable!, updateFactor!
 export deleteVariable!, deleteFactor!
-export getAdjacencyMatrix, getAdjacencyMatrixSparse
+export getIncidenceMatrix, getIncidenceMatrixSparse
 export getNeighbors
 export getSubgraphAroundNode
 export getSubgraph

src/attic/MetaGraphsDFG/MetaGraphsDFG.jl renamed to attic/MetaGraphsDFG/MetaGraphsDFG.jl

@@ -506,7 +506,7 @@ Get an adjacency matrix for the DFG, returned as a Matrix{Union{Nothing, Symbol}
 Rows are all factors, columns are all variables, and each cell contains either nothing or the symbol of the relating factor.
 The first row and first column are factor and variable headings respectively.
 """
-function getAdjacencyMatrix(dfg::MetaGraphsDFG)::Matrix{Union{Nothing, Symbol}}
+function getIncidenceMatrix(dfg::MetaGraphsDFG)::Matrix{Union{Nothing, Symbol}}
     varLabels = map(v->v.label, getVariables(dfg))
     factLabels = map(f->f.label, getFactors(dfg))
     vDict = Dict(varLabels .=> [1:length(varLabels)...].+1)
@@ -522,7 +522,7 @@ function getAdjacencyMatrix(dfg::MetaGraphsDFG)::Matrix{Union{Nothing, Symbol}}
     return adjMat
 end
 
-function getAdjacencyMatrixSparse(dfg::MetaGraphsDFG)::Tuple{LightGraphs.SparseMatrixCSC, Vector{Symbol}, Vector{Symbol}}
+function getIncidenceMatrixSparse(dfg::MetaGraphsDFG)::Tuple{LightGraphs.SparseMatrixCSC, Vector{Symbol}, Vector{Symbol}}
     adj = LightGraphs.adjacency_matrix(dfg.g)
     v_labels = getVariableIds(dfg)
     f_labels = getFactorIds(dfg)

src/attic/MetaGraphsDFG/entities/MetaGraphsDFG.jl renamed to attic/MetaGraphsDFG/entities/MetaGraphsDFG.jl

@@ -34,8 +34,8 @@ import ...DistributedFactorGraphs:  setSolverParams,
                                     getNeighbors,
                                     getSubgraphAroundNode,
                                     getSubgraph,
-                                    getAdjacencyMatrix,
-                                    getAdjacencyMatrixSparse,
+                                    getIncidenceMatrix,
+                                    getIncidenceMatrixSparse,
                                     _getDuplicatedEmptyDFG
 
 include("SymbolFactorGraphs/SymbolFactorGraphs.jl")