Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d7d970a
Duration Constraint
BBhattacharyya1729 Apr 21, 2025
f4513fd
Merge remote-tracking branch 'upstream/main'
BBhattacharyya1729 May 1, 2025
b9981a7
free phases
andgoldschmidt May 3, 2025
acf0de1
intro global constraints / objectives, constraints to use global dim …
andgoldschmidt May 5, 2025
55e0a8b
Added Pairwise
BBhattacharyya1729 May 6, 2025
66f6941
clean
andgoldschmidt May 7, 2025
3d9e65a
Merge branch 'main' of github.com:harmoniqs/DirectTrajOpt.jl into fea…
andgoldschmidt May 7, 2025
aec79a7
Merge branch 'main' of github.com:harmoniqs/DirectTrajOpt.jl into fea…
andgoldschmidt May 7, 2025
8d936fe
refactor to separate pure knot point from global mixed
andgoldschmidt May 9, 2025
5c009eb
check overlapping constraint for zero reset
andgoldschmidt May 10, 2025
da8a5be
add reset for global nonlinear constraint
andgoldschmidt May 10, 2025
b2deb0f
min time obj free time only
andgoldschmidt May 19, 2025
6f9db34
added duration and symmetry consraints
BBhattacharyya1729 May 28, 2025
dcc5643
Update regularizers.jl
BBhattacharyya1729 May 28, 2025
ef4657a
Merge branch 'harmoniqs:main' into Feature/DurationSymmetry
BBhattacharyya1729 May 28, 2025
dd18f16
Merge branch 'main' into feature/free-phases
andgoldschmidt Jun 4, 2025
d7781ab
update global data
andgoldschmidt Jun 5, 2025
5911dc1
refactor NT concrete
Jun 7, 2025
1ffee19
update for new NT
Jun 13, 2025
c0213ea
added tests for symmetry and duration constraints
BBhattacharyya1729 Jun 16, 2025
9b6f1e7
Fixed duration/symmetry constraint tests
BBhattacharyya1729 Jun 16, 2025
1b07173
update for parametric NT, test global obj and constraints
andgoldschmidt Jun 17, 2025
e9623fb
Merge remote-tracking branch 'bikrant/Feature/DurationSymmetry' into …
andgoldschmidt Jun 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
check overlapping constraint for zero reset
  • Loading branch information
andgoldschmidt committed May 10, 2025
commit 5c009ebcdea194e9696c5bf1caaf0bc54dc590b4
2 changes: 1 addition & 1 deletion src/constraints/_constraints.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ abstract type AbstractNonlinearConstraint <: AbstractConstraint end

include("linear_constraints.jl")
include("nonlinear_constraints.jl")
include("global_nonlinear_constraints.jl")
include("nonlinear_global_constraints.jl")

end
252 changes: 0 additions & 252 deletions src/constraints/global_nonlinear_constraints.jl

This file was deleted.

7 changes: 5 additions & 2 deletions src/constraints/nonlinear_constraints.jl
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ struct NonlinearKnotPointConstraint <: AbstractNonlinearConstraint
x_comps = vcat([traj.components[name] for name in names]...)
x_slices = [slice(t, x_comps, traj.dim) for t in times]

@assert g(traj[times[1]].data[x_comps], params[1]) isa AbstractVector{Float64}
g_dim = length(g(traj[times[1]].data[x_comps], params[1]))
# inspect view of knot point data
@assert g(traj.datavec[x_slices[1]], params[1]) isa AbstractVector{Float64}
g_dim = length(g(traj.datavec[x_slices[1]], params[1]))

@views function g!(δ::AbstractVector, Z⃗::AbstractVector)
for (i, x_slice) ∈ enumerate(x_slices)
Expand Down Expand Up @@ -149,6 +150,7 @@ function get_full_jacobian(
Z_dim = traj.dim * traj.T + traj.global_dim
∂g_full = spzeros(NLC.dim, Z_dim)
for (i, (k, ∂gₖ)) ∈ enumerate(zip(NLC.times, NLC.∂gs))
# Disjoint
∂g_full[slice(i, NLC.g_dim), slice(k, traj.dim)] = ∂gₖ
end
return ∂g_full
Expand All @@ -161,6 +163,7 @@ function get_full_hessian(
Z_dim = traj.dim * traj.T + traj.global_dim
μ∂²g_full = spzeros(Z_dim, Z_dim)
for (k, μ∂²gₖ) ∈ zip(NLC.times, NLC.μ∂²gs)
# Disjoint
μ∂²g_full[slice(k, traj.dim), slice(k, traj.dim)] = μ∂²gₖ
end
return μ∂²g_full
Expand Down
Loading
Loading