From 50d47eabfd67d02efaa7959d178b9454e9361ac5 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Mon, 14 Jul 2025 15:17:47 +1200 Subject: [PATCH 1/2] Update Project.toml with name and Julia compat --- Project.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index ede3b67..08003ed 100644 --- a/Project.toml +++ b/Project.toml @@ -1,4 +1,4 @@ -name = "MathOptConflictSolver" +name = "MathOptIIS" uuid = "8c4f8055-bd93-4160-a86b-a0c04941dbff" version = "0.1.0" @@ -6,4 +6,5 @@ version = "0.1.0" MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" [compat] -MathOptInterface = "1.37.0" \ No newline at end of file +MathOptInterface = "1.37.0" +julia = "1.6" From e4518cee77f01ec00ecf43dcf57a4c1ac04e90c5 Mon Sep 17 00:00:00 2001 From: odow Date: Mon, 14 Jul 2025 15:24:02 +1200 Subject: [PATCH 2/2] Fix rename --- README.md | 18 +++++++++--------- docs/Project.toml | 4 ++-- docs/make.jl | 6 +++--- docs/src/index.md | 8 ++++---- ...{MathOptConflictSolver.jl => MathOptIIS.jl} | 4 ++-- src/iis.jl | 2 +- test/MathOptConflictSolver.jl | 8 ++++---- test/iis.jl | 2 +- test/runtests.jl | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) rename src/{MathOptConflictSolver.jl => MathOptIIS.jl} (84%) diff --git a/README.md b/README.md index b67a5cb..542b174 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,31 @@ -# MathOptConflictSolver.jl +# MathOptIIS.jl -[![Build Status](https://github.com/jump-dev/MathOptConflictSolver.jl/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/jump-dev/MathOptConflictSolver.jl/actions?query=workflow%3ACI) -[![codecov](https://codecov.io/gh/jump-dev/MathOptConflictSolver.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/jump-dev/MathOptConflictSolver.jl) +[![Build Status](https://github.com/jump-dev/MathOptIIS.jl/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/jump-dev/MathOptIIS.jl/actions?query=workflow%3ACI) +[![codecov](https://codecov.io/gh/jump-dev/MathOptIIS.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/jump-dev/MathOptIIS.jl) -[MathOptConflictSolver.jl](https://github.com/jump-dev/MathOptConflictSolver.jl) is a +[MathOptIIS.jl](https://github.com/jump-dev/MathOptIIS.jl) is a basic conflict solver for MathOptInterface.jl. ## License -`MathOptConflictSolver.jl` is licensed under the [MIT License](https://github.com/jump-dev/MultiObjectiveAlgorithms.jl/blob/main/LICENSE.md). +`MathOptIIS.jl` is licensed under the [MIT License](https://github.com/jump-dev/MultiObjectiveAlgorithms.jl/blob/main/LICENSE.md). ## Getting help If you need help, please ask a question on the [JuMP community forum](https://jump.dev/forum). -If you have a reproducible example of a bug, please [open a GitHub issue](https://github.com/jump-dev/MathOptConflictSolver.jl/issues/new). +If you have a reproducible example of a bug, please [open a GitHub issue](https://github.com/jump-dev/MathOptIIS.jl/issues/new). ## Installation -Install `MathOptConflictSolver` using `Pkg.add`: +Install `MathOptIIS` using `Pkg.add`: ```julia import Pkg -Pkg.add(; url = "https://github.com/jump-dev/MathOptConflictSolver.jl") +Pkg.add(; url = "https://github.com/jump-dev/MathOptIIS.jl") ``` ## Documentation -The [documentation for MathOptConflictSolver.jl](https://jump.dev/MathOptConflictSolver.jl/dev/) +The [documentation for MathOptIIS.jl](https://jump.dev/MathOptIIS.jl/dev/) describes how to use the package. diff --git a/docs/Project.toml b/docs/Project.toml index 32fdd25..ea9e43c 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,7 +1,7 @@ [deps] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -MathOptConflictSolver = "8c4f8055-bd93-4160-a86b-a0c04941dbff" +MathOptIIS = "8c4f8055-bd93-4160-a86b-a0c04941dbff" JuMP = "4076af6c-e467-56ae-b986-b466b2749572" [compat] -JuMP = "1.24.0" \ No newline at end of file +JuMP = "1.24.0" diff --git a/docs/make.jl b/docs/make.jl index 74a9806..574c9ac 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,8 +1,8 @@ -using Documenter, MathOptConflictSolver, JuMP +using Documenter, MathOptIIS, JuMP -makedocs(; sitename = "MathOptConflictSolver.jl documentation") +makedocs(; sitename = "MathOptIIS.jl documentation") deploydocs(; - repo = "github.com/jump-dev/MathOptConflictSolver.jl.git", + repo = "github.com/jump-dev/MathOptIIS.jl.git", push_preview = true, ) diff --git a/docs/src/index.md b/docs/src/index.md index 4a7cff1..78c2fad 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -1,10 +1,10 @@ ```@meta -CurrentModule = MathOptConflictSolver +CurrentModule = MathOptIIS DocTestSetup = quote - using MathOptConflictSolver + using MathOptIIS end ``` -# MathOptConflictSolver.jl +# MathOptIIS.jl -This package is a basic conflict solver for MathOptInterface.jl. \ No newline at end of file +This package is a basic conflict solver for MathOptInterface.jl. diff --git a/src/MathOptConflictSolver.jl b/src/MathOptIIS.jl similarity index 84% rename from src/MathOptConflictSolver.jl rename to src/MathOptIIS.jl index af956a1..8bdbf39 100644 --- a/src/MathOptConflictSolver.jl +++ b/src/MathOptIIS.jl @@ -3,7 +3,7 @@ # Use of this source code is governed by an MIT-style license that can be found # in the LICENSE.md file or at https://opensource.org/licenses/MIT. -module MathOptConflictSolver +module MathOptIIS import MathOptInterface as MOI @@ -12,4 +12,4 @@ include("bound.jl") include("range.jl") include("solver.jl") -end # module MathOptConflictSolver +end # module MathOptIIS diff --git a/src/iis.jl b/src/iis.jl index 8c66aa4..19056b0 100644 --- a/src/iis.jl +++ b/src/iis.jl @@ -272,7 +272,7 @@ function MOI.compute_conflict!(optimizer::Optimizer) optimizer.start_time = time() if optimizer.verbose - println("Starting MathOptConflictSolver IIS search.") + println("Starting MathOptIIS IIS search.") end T = Float64 diff --git a/test/MathOptConflictSolver.jl b/test/MathOptConflictSolver.jl index a0e7ff3..c236c60 100644 --- a/test/MathOptConflictSolver.jl +++ b/test/MathOptConflictSolver.jl @@ -3,9 +3,9 @@ # Use of this source code is governed by an MIT-style license that can be found # in the LICENSE.md file or at https://opensource.org/licenses/MIT. -module TestMathOptConflictSolver +module TestMathOptIIS -import MathOptConflictSolver +import MathOptIIS import MathOptInterface as MOI using Test using JuMP @@ -26,6 +26,6 @@ function test_1() return end -end # module TestMathOptConflictSolver +end # module TestMathOptIIS -TestMathOptConflictSolver.runtests() +TestMathOptIIS.runtests() diff --git a/test/iis.jl b/test/iis.jl index 74a2ca9..aa84e46 100644 --- a/test/iis.jl +++ b/test/iis.jl @@ -7,7 +7,7 @@ module TestIIS import HiGHS using JuMP -import MathOptConflictSolver as MOCS +import MathOptIIS as MOCS using Test function runtests() diff --git a/test/runtests.jl b/test/runtests.jl index ec40edc..246524e 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -5,7 +5,7 @@ using Test -@testset "MathOptConflictSolver" begin +@testset "MathOptIIS" begin for file in readdir(@__DIR__) if !endswith(file, ".jl") || file in ("runtests.jl",) continue