Skip to content

Commit d803607

Browse files
authored
Merge pull request #18 from maxhcohen/rename
Renamed package to ControlBarrierFunctions
2 parents c7c1753 + 4f495be commit d803607

File tree

11 files changed

+42
-34
lines changed

11 files changed

+42
-34
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
- run: |
6262
julia --project=docs -e '
6363
using Documenter: doctest
64-
using CBFToolbox # change to the name of your package
65-
doctest(CBFToolbox)' # change to the name of your package
64+
using ControlBarrierFunctions # change to the name of your package
65+
doctest(ControlBarrierFunctions)' # change to the name of your package
6666
- run: julia --project=docs docs/make.jl
6767
env:
6868
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Manifest.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.10.4"
44
manifest_format = "2.0"
5-
project_hash = "ad05b28674e6254a83a89b8c4348f48c2e3b78e0"
5+
project_hash = "d904e69cf5f4914450332acac1ec16cb69ba172f"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "99a6f5d0ce1c7c6afdb759daa30226f71c54f6b0"
@@ -295,9 +295,9 @@ version = "5.47.4"
295295

296296
[[deps.DiffEqBase]]
297297
deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"]
298-
git-tree-sha1 = "2f3dfa7d150ca5401482777836d0e8f361087a80"
298+
git-tree-sha1 = "4cb796ab54311147b9c7191d34d502693b603a22"
299299
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
300-
version = "6.153.0"
300+
version = "6.154.0"
301301

302302
[deps.DiffEqBase.extensions]
303303
DiffEqBaseCUDAExt = "CUDA"
@@ -366,9 +366,9 @@ version = "7.13.0"
366366

367367
[[deps.DifferentiationInterface]]
368368
deps = ["ADTypes", "Compat", "DocStringExtensions", "FillArrays", "LinearAlgebra", "PackageExtensionCompat", "SparseArrays", "SparseMatrixColorings"]
369-
git-tree-sha1 = "5f9a52dc40218e85daa695600733f5ccaa7eb80b"
369+
git-tree-sha1 = "06955b4e80eff01df10552ccf0226571bde94d49"
370370
uuid = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
371-
version = "0.5.13"
371+
version = "0.5.14"
372372

373373
[deps.DifferentiationInterface.extensions]
374374
DifferentiationInterfaceChainRulesCoreExt = "ChainRulesCore"
@@ -791,9 +791,9 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
791791

792792
[[deps.LinearSolve]]
793793
deps = ["ArrayInterface", "ChainRulesCore", "ConcreteStructs", "CpuId", "DocStringExtensions", "EnumX", "FastLapackInterface", "GPUArraysCore", "InteractiveUtils", "KLU", "Krylov", "LazyArrays", "Libdl", "LinearAlgebra", "MKL_jll", "Markdown", "PrecompileTools", "Preferences", "RecursiveFactorization", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Sparspak", "StaticArraysCore", "UnPack"]
794-
git-tree-sha1 = "ee625f4053362526950661ce3022c7a483c6f8e5"
794+
git-tree-sha1 = "6b7011b27e35453f68a8f851776271b31fce021c"
795795
uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
796-
version = "2.32.0"
796+
version = "2.33.0"
797797

798798
[deps.LinearSolve.extensions]
799799
LinearSolveBandedMatricesExt = "BandedMatrices"
@@ -1286,9 +1286,9 @@ version = "0.6.43"
12861286

12871287
[[deps.SciMLBase]]
12881288
deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"]
1289-
git-tree-sha1 = "79564263adfdeb7a7110316c0bf0da55b95ab281"
1289+
git-tree-sha1 = "5123ca064567e81c31fb3acdf15d2c9459bb7cc3"
12901290
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1291-
version = "2.49.0"
1291+
version = "2.50.0"
12921292

12931293
[deps.SciMLBase.extensions]
12941294
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
@@ -1489,9 +1489,9 @@ version = "2.3.0"
14891489

14901490
[[deps.StochasticDiffEq]]
14911491
deps = ["Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DiffEqNoiseProcess", "DocStringExtensions", "FiniteDiff", "ForwardDiff", "JumpProcesses", "LevyArea", "LinearAlgebra", "Logging", "MuladdMacro", "NLsolve", "OrdinaryDiffEq", "Random", "RandomNumbers", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SparseArrays", "SparseDiffTools", "StaticArrays", "UnPack"]
1492-
git-tree-sha1 = "b47f8ccc5bd06d5f7a643bf6671365ab9d6595d9"
1492+
git-tree-sha1 = "1e013d271e025fc676f5b944f9537e09238b73c5"
14931493
uuid = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
1494-
version = "6.67.0"
1494+
version = "6.68.0"
14951495

14961496
[[deps.StrideArraysCore]]
14971497
deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"]
@@ -1510,9 +1510,9 @@ version = "7.2.1+1"
15101510

15111511
[[deps.Sundials]]
15121512
deps = ["CEnum", "DataStructures", "DiffEqBase", "Libdl", "LinearAlgebra", "Logging", "PrecompileTools", "Reexport", "SciMLBase", "SparseArrays", "Sundials_jll"]
1513-
git-tree-sha1 = "e15f5a73f0d14b9079b807a9d1dac13e4302e997"
1513+
git-tree-sha1 = "82304990120934137261aa085e0d05a412fe0825"
15141514
uuid = "c3572dad-4567-51f8-b174-8c6c989267f4"
1515-
version = "4.24.0"
1515+
version = "4.25.0"
15161516

15171517
[[deps.Sundials_jll]]
15181518
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "SuiteSparse_jll", "libblastrampoline_jll"]

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name = "CBFToolbox"
2-
uuid = "9bb58977-20e0-447d-80ed-b4444e16eeb9"
1+
name = "ControlBarrierFunctions"
2+
uuid = "e4acb5c7-ee58-4719-8a40-5cc01da1b2a4"
33
authors = ["Max Cohen <maxcohen@caltech.edu>"]
44
version = "0.1.0"
55

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
[![Build status (Github Actions)](https://github.com/maxhcohen/CBFToolbox.jl/workflows/CI/badge.svg)](https://github.com/maxhcohen/CBFToolbox.jl/actions)
2-
[![codecov.io](http://codecov.io/github/maxhcohen/CBFToolbox.jl/coverage.svg?branch=main)](http://codecov.io/github/maxhcohen/CBFToolbox.jl?branch=main)
3-
[![](https://img.shields.io/badge/docs-dev-blue.svg)](https://maxhcohen.github.io/CBFToolbox.jl/dev)
1+
[![Build status (Github Actions)](https://github.com/maxhcohen/ControlBarrierFunctions.jl/workflows/CI/badge.svg)](https://github.com/maxhcohen/ControlBarrierFunctions.jl/actions)
2+
[![codecov.io](http://codecov.io/github/maxhcohen/ControlBarrierFunctions.jl/coverage.svg?branch=main)](http://codecov.io/github/maxhcohen/CBFToolbox.jl?branch=main)
3+
[![](https://img.shields.io/badge/docs-dev-blue.svg)](https://maxhcohen.github.io/ControlBarrierFunctions.jl/dev)
44

5-
# CBFToolbox.jl
5+
# ControlBarrierFunctions.jl
66
A package for implementing control barrier functions (CBFs) in Julia.
77

88
## Overview
@@ -13,13 +13,13 @@ To download this package open the Julia REPL, enter the package manager (type `]
1313

1414
```julia
1515
using Pkg
16-
Pkg.add("https://github.com/maxhcohen/CBFToolbox.jl")
16+
Pkg.add("https://github.com/maxhcohen/ControlBarrierFunctions.jl")
1717
```
1818

1919
## Usage
2020
```julia
2121
# Load in packages
22-
using CBFToolbox
22+
using ControlBarrierFunctions
2323
using LinearAlgebra
2424
using Plots
2525

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[deps]
2-
CBFToolbox = "9bb58977-20e0-447d-80ed-b4444e16eeb9"
2+
ControlBarrierFunctions = "e4acb5c7-ee58-4719-8a40-5cc01da1b2a4"
33
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
44
DocumenterTools = "35a29f4d-8980-5a13-9543-d66fff28ecb8"

docs/make.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ using Pkg
33
Pkg.activate(".")
44
Pkg.instantiate()
55
using Documenter
6-
using CBFToolbox
6+
using ControlBarrierFunctions
77

88
makedocs(;
9-
sitename="CBFToolbox.jl",
9+
sitename="ControlBarrierFunctions.jl",
1010
pages=[
1111
"Home" => "index.md",
1212
"Systems" => "systems.md",
@@ -16,4 +16,4 @@ makedocs(;
1616
],
1717
)
1818

19-
deploydocs(; repo="github.com/maxhcohen/CBFToolbox.jl", devbranch="main")
19+
deploydocs(; repo="github.com/maxhcohen/ControlBarrierFunctions.jl", devbranch="main")

docs/src/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CBFToolbox.jl
1+
# ControlBarrierFunctions.jl
22
A package for implementing control barrier functions (CBFs) in Julia.
33

44
## Overview
@@ -8,13 +8,13 @@ This toolbox provides utilities to construct nonlinear systems and control polic
88
To download this package open the Julia REPL, enter the package manager (type `]` into the REPL) and run
99
```julia
1010
using Pkg
11-
Pkg.add("https://github.com/maxhcohen/CBFToolbox.jl")
11+
Pkg.add("https://github.com/maxhcohen/ControlBarrierFunctions.jl")
1212
```
1313

1414
## Usage
1515
```julia
1616
# Load in packages
17-
using CBFToolbox
17+
using ControlBarrierFunctions
1818
using LinearAlgebra
1919
using Plots
2020

examples/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[deps]
2-
CBFToolbox = "9bb58977-20e0-447d-80ed-b4444e16eeb9"
2+
ControlBarrierFunctions = "e4acb5c7-ee58-4719-8a40-5cc01da1b2a4"
33
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
44
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
55
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

examples/obstacle_avoidance.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Load in packages
22
using Revise
3-
using CBFToolbox
3+
using ControlBarrierFunctions
44
using LinearAlgebra
55
using Plots
66

src/CBFToolbox.jl renamed to src/ControlBarrierFunctions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module CBFToolbox
1+
module ControlBarrierFunctions
22

33
# Julia packages required for this module
44
using LinearAlgebra

test/runtests.jl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Test
2-
using CBFToolbox
2+
using ControlBarrierFunctions
33
using LinearAlgebra
44
using ForwardDiff
55

@@ -17,6 +17,14 @@ g(x) = [1.0 0.0; 0.0 1.0]
1717
@test Σ.f(zeros(2)) == f(zeros(2))
1818
@test Σ.g(zeros(2)) == g(zeros(2))
1919

20+
# Do it again without specifying name
21+
Σ1 = ControlAffineSystem(n, m, f, g)
22+
@test Σ1.name == ""
23+
@test Σ1.n == n
24+
@test Σ1.m == m
25+
@test Σ1.f(zeros(2)) == f(zeros(2))
26+
@test Σ1.g(zeros(2)) == g(zeros(2))
27+
2028
# Make sure we can simulate a simple system
2129
x0 = [-1.0, 1.0]
2230
T = 20.0

0 commit comments

Comments
 (0)