Skip to content

Commit 11f6b2d

Browse files
authored
Merge pull request #845 from JuliaRobotics/22Q1/maint/837
Neo4jDFG replaces CloudGraphsDFG
2 parents f9a7c79 + b5a4620 commit 11f6b2d

27 files changed

+234
-177
lines changed

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Copyright (c) 2017-2021 NavAbility
33
NOTICE: this license will be relaxed to be much more permissive soon.
44

55
The source code in this repository is separated into two parts
6-
that are licensed separately. The CloudGraphDFG library/driver
6+
that are licensed separately. The Neo4jDFG library/driver
77
is licensed separately. For more details see:
8-
https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/blob/develop/src/CloudGraphsDFG/LICENSE
8+
https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/blob/develop/src/Neo4jDFG/LICENSE
99

1010
DistributedFactorGraphs.jl, is not licensed for hosted, webservice or cloud
1111
solutions (public or private). Please contact NavAbility via email at

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Listing news on any major breaking changes in DFG. For regular changes, see int
99
- `LocalDFG` replaces `DefaultDFG` (#844).
1010
- Optimized creation of CGDFG / `createDfgSessionIfNotExist` (#839, #815).
1111
- `plotDFG` replaces `dfgplot` (#841, #844).
12+
- `Neo4jDFG` replaces `CloudGraphsDFG` (#836).
1213

1314
# v0.16.0
1415

attic/DataStoreTests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ using UUIDs
99

1010
include("testBlocks.jl")
1111

12-
testDFGAPI = CloudGraphsDFG
12+
testDFGAPI = Neo4jDFG
1313
end
1414
# Build a basic graph.
1515

attic/MetaGraphsDFG/services/MetaGraphsDFG.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ end
566566

567567
"""
568568
$(SIGNATURES)
569-
Gets an empty and unique CloudGraphsDFG derived from an existing DFG.
569+
Gets an empty and unique Neo4jDFG derived from an existing DFG.
570570
"""
571571
function _getDuplicatedEmptyDFG(dfg::MetaGraphsDFG{P})::MetaGraphsDFG where {P <: AbstractParams}
572572
newDfg = MetaGraphsDFG{P}(;

attic/SymbolDFG/services/SymbolDFG.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ end
457457

458458
"""
459459
$(SIGNATURES)
460-
Gets an empty and unique CloudGraphsDFG derived from an existing DFG.
460+
Gets an empty and unique Neo4jDFG derived from an existing DFG.
461461
"""
462462
function _getDuplicatedEmptyDFG(dfg::SymbolDFG{T,V,F})::SymbolDFG where {T <: AbstractParams, V <: DFGNode, F <:DFGNode}
463463
newDfg = SymbolDFG{T, V, F}(;

docs/make.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ makedocs(
1818
],
1919
# "DistributedFactorGraph API's" => [
2020
# "LightDFGs" => "apis/LightGraphs.md",
21-
# "CloudGraphsDFGs" => "apis/CloudGraphs.md",
21+
# "Neo4jDFGs" => "apis/CloudGraphs.md",
2222
# ],
2323
"Function Reference" => "func_ref.md"
2424
]

docs/src/BuildingGraphs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ To continue the example, run one of the following to create a DFG driver:
3535
dfg = LightDFG{SolverParams}(solverParams=SolverParams())
3636
```
3737

38-
### Creating a CloudGraphsDFG Graph
38+
### Creating a Neo4jDFG Graph
3939

4040
```julia
4141
# Create a DFG with no solver parameters (just to demonstrate the difference) using the CloudGraphs driver, and connect it to a local Neo4j instance.
42-
cfg = CloudGraphsDFG{NoSolverParams}("localhost", 7474, "neo4j", "test",
42+
cfg = Neo4jDFG{NoSolverParams}("localhost", 7474, "neo4j", "test",
4343
"testUser", "testRobot", "testSession")
4444
```
4545

docs/src/func_ref.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ Modules = [DistributedFactorGraphs]
125125
Pages = ["FileDFG.jl"]
126126
```
127127

128-
### CloudGraphsDFGs
128+
### Neo4jDFGs
129129

130130
```@autodocs
131-
Modules = [CloudGraphsDFGs]
131+
Modules = [Neo4jDFGs]
132132
```
133133

134134

src/DistributedFactorGraphs.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ include("Common.jl")
322322
include("DataBlobs/DataBlobs.jl")
323323

324324
if get(ENV, "DFG_USE_CGDFG", "") == "true"
325-
@info "Detected ENV[\"DFG_USE_CGDFG\"]: Including optional CloudGraphsDFG (LGPL) Driver"
326-
include("CloudGraphsDFG/CloudGraphsDFG.jl")
327-
@reexport using .CloudGraphsDFGs
325+
@info "Detected ENV[\"DFG_USE_CGDFG\"]: Including optional Neo4jDFG (LGPL) Driver"
326+
include("Neo4jDFG/Neo4jDFG.jl")
327+
@reexport using .Neo4jDFGs
328328
end
329329

330330
function __init__()

src/CloudGraphsDFG/LICENSE renamed to src/Neo4jDFG/LICENSE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ NavAbility reserves all rights regarding, and to deny use of the software
77
for hosted webservice or cloud offerings or deployments; over and above
88
any conflicts that may arise with the LGPLv3 license copied hereafter.
99

10-
Other general use or modification of the CloudGraphDFG library/driver
10+
Other general use or modification of the Neo4jDFG library/driver
1111
beyond that of webservices or clouds (private or public) is permitted
1212
according to terms defined by LGPLv3.
1313

14-
The CloudGraphDFG library/driver is an optional library of the
14+
The Neo4jDFG library/driver is an optional library of the
1515
DistributedFactorGraph.jl/Caesar.jl related ecosystem,
1616
but is NOT required for related computations and other features offered
1717
by the Caesar.jl system. Please visit JuliaRobotics/Caesar.jl for
18-
more details on use of the software without the CloudGraphsDFG library.
18+
more details on use of the software without the Neo4jDFG library.
1919

20-
A standalone CloudGraphsDFG driver can be obtained by simply copying
21-
the folder src/CloudGraphsDFG, and a library "header" definition
22-
(i.e. a "Julia Module") can be found in the file CloudGraphsDFG.jl.
20+
A standalone Neo4jDFG driver can be obtained by simply copying
21+
the folder src/Neo4jDFG, and a library "header" definition
22+
(i.e. a "Julia Module") can be found in the file Neo4jDFG.jl.
2323

2424
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2525
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

0 commit comments

Comments
 (0)