Merge pull request #15 from exanauts/kk/dev

Rename SQP to SqpSolver
exanauts · May 12, 2023 · 8bcae2a · 8bcae2a
2 parents c1fce0a + 822b5e5
commit 8bcae2a
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 32 deletions.
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.8']
+        julia-version: ['1.9']
         julia-arch: [x64]
         os: [ubuntu-latest]
 

diff --git a/Project.toml b/Project.toml
@@ -1,4 +1,4 @@
-name = "SQP"
+name = "SqpSolver"
 uuid = "ffdd34ce-459d-4fc7-82a1-202b2ab8becf"
 authors = ["Kibaek Kim <kibaek.k@gmail.com>"]
 version = "0.1.0"

diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
-# SQP.jl
+# SqpSolver.jl
 
-![Run tests](https://github.com/exanauts/SQP.jl/workflows/Run%20tests/badge.svg?branch=master)
-[![codecov](https://codecov.io/gh/exanauts/SQP.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/exanauts/SQP.jl)
+![Run tests](https://github.com/exanauts/SqpSolver.jl/workflows/Run%20tests/badge.svg?branch=master)
+[![codecov](https://codecov.io/gh/exanauts/SqpSolver.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/exanauts/SqpSolver.jl)
 
 This is a Julia package that implements sequantial quadratic programming algorithms for continuous nonlinear optimization.
 
 ## Installation
 
 ```julia
-]add https://github.com/exanauts/SQP.jl
+]add SqpSolver
 ```
 
 ## Example
@@ -23,15 +23,15 @@ s.t.  x^2 - x = 2
 This problem can be solved by the following code snippet:
 ```julia
 # Load packages
-using SQP, JuMP
+using SqpSolver, JuMP
 using Ipopt # can be any QP solver
 
 # Number of variables
 n = 1
 
 # Build nonlinear problem model via JuMP
 model = Model(optimizer_with_attributes(
-    SQP.Optimizer, 
+    SqpSolver.Optimizer, 
     "external_optimizer" => Ipopt.Optimizer,
 ))
 @variable(model, x)

diff --git a/examples/Project.toml b/examples/Project.toml
@@ -1,5 +1,5 @@
 [deps]
-SQP = "ffdd34ce-459d-4fc7-82a1-202b2ab8becf"
+SqpSolver = "ffdd34ce-459d-4fc7-82a1-202b2ab8becf"
 Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"

diff --git a/examples/acopf/Project.toml b/examples/acopf/Project.toml
@@ -4,5 +4,5 @@ Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 PowerModels = "c36e90e8-916a-50a6-bd94-075b64ef4655"
 Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
-SQP = "ffdd34ce-459d-4fc7-82a1-202b2ab8becf"
+SqpSolver = "ffdd34ce-459d-4fc7-82a1-202b2ab8becf"
 filterSQP = "f1ca9057-ba27-4701-aaf7-0436ee83bb57"
diff --git a/examples/acopf/opf.jl b/examples/acopf/opf.jl
@@ -1,5 +1,5 @@
 using Revise
-using SQP
+using SqpSolver
 using PowerModels, JuMP, Ipopt
 using filterSQP
 using CPLEX
@@ -70,7 +70,7 @@ function run_sqp_opf(data_file::String, max_iter::Int = 100)
     )
 
     result = optimize_model!(pm, optimizer = optimizer_with_attributes(
-        SQP.Optimizer, 
+        SqpSolver.Optimizer, 
         "algorithm" => "SQP-TR",
         "external_optimizer" => qp_solver,
         "tol_infeas" => 1.e-6,

diff --git a/examples/toy_example.jl b/examples/toy_example.jl
@@ -1,4 +1,4 @@
-using SQP, Ipopt
+using SqpSolver, Ipopt
 using JuMP
 
 ipopt_solver = optimizer_with_attributes(
@@ -7,7 +7,7 @@ ipopt_solver = optimizer_with_attributes(
     "warm_start_init_point" => "yes",
 )
 optimizer = optimizer_with_attributes(
-    SQP.Optimizer, 
+    SqpSolver.Optimizer, 
     "external_optimizer" => ipopt_solver,
     "max_iter" => 100,
     "algorithm" => "SQP-TR",

diff --git a/src/MOI_wrapper.jl b/src/MOI_wrapper.jl
@@ -12,7 +12,7 @@ _ConstraintInfo(func, set) = _ConstraintInfo(func, set, nothing)
 """
     Optimizer()
 
-Create a new SQP optimizer.
+Create a new SqpSolver optimizer.
 """
 mutable struct Optimizer <: MOI.AbstractOptimizer
     inner::Union{Model,Nothing}
@@ -173,7 +173,7 @@ function MOI.copy_to(model::Optimizer, src::MOI.ModelLike)
     return MOI.Utilities.default_copy_to(model, src)
 end
 
-MOI.get(::Optimizer, ::MOI.SolverName) = "SQP"
+MOI.get(::Optimizer, ::MOI.SolverName) = "SqpSolver"
 
 function MOI.supports_constraint(
     ::Optimizer,
@@ -746,8 +746,8 @@ function MOI.set(
     return
 end
 
-### SQP callback functions
-### In setting up the data for SQP, we order the constraints as follows:
+### SqpSolver callback functions
+### In setting up the data for SqpSolver, we order the constraints as follows:
 ### - linear_le_constraints
 ### - linear_ge_constraints
 ### - linear_eq_constraints

diff --git a/src/SQP.jl → src/SqpSolver.jl b/src/SQP.jl → src/SqpSolver.jl
@@ -1,4 +1,4 @@
-module SQP
+module SqpSolver
 
 using LinearAlgebra
 using SparseArrays

diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl
@@ -1,16 +1,16 @@
 module TestMOIWrapper
 
-using SQP
+using SqpSolver
 using Ipopt
 using JuMP
 using Test
 
-const MOI = SQP.MathOptInterface
+const MOI = SqpSolver.MathOptInterface
 const MOIT = MOI.Test
 const MOIU = MOI.Utilities
 const MOIB = MOI.Bridges
 
-const optimizer = SQP.Optimizer()
+const optimizer = SqpSolver.Optimizer()
 const ipopt_optimizer = optimizer_with_attributes(
     Ipopt.Optimizer,
     "print_level" => 0,

diff --git a/test/Project.toml b/test/Project.toml
@@ -6,5 +6,4 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
-PowerModels = "c36e90e8-916a-50a6-bd94-075b64ef4655"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
diff --git a/test/ext_solver.jl b/test/ext_solver.jl
@@ -5,7 +5,7 @@ qp_solver = optimizer_with_attributes(
     "warm_start_init_point" => "yes",
 )
 optimizer_solver = optimizer_with_attributes(
-    SQP.Optimizer,
+    SqpSolver.Optimizer,
     "external_optimizer" => qp_solver,
     "algorithm" => "SQP-TR",
     "OutputFlag" => 0,

diff --git a/test/opf.jl b/test/opf.jl
@@ -16,7 +16,7 @@ function run_sqp_opf(data_file::String, max_iter::Int = 100)
         "warm_start_init_point" => "yes",
     )
     result = optimize_model!(pm, optimizer = optimizer_with_attributes(
-        SQP.Optimizer, 
+        SqpSolver.Optimizer, 
         "algorithm" => "SQP-TR",
         "external_optimizer" => qp_solver,
         "max_iter" => max_iter,

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,4 +1,4 @@
-using SQP
+using SqpSolver
 using JuMP, MathOptInterface
 using Ipopt
 using Test
@@ -13,9 +13,3 @@ end
     @test isapprox(ysol, -1.0, rtol=1e-4)
     @test status == MOI.LOCALLY_SOLVED
 end
-
-@testset "opf.jl" begin
-    include("opf.jl")
-    result = run_sqp_opf("../examples/acopf/case3.m", 100)
-    @test isapprox(result["objective"], +5.90687949e+03, rtol=1e-2)
-end