Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name = "MathOptConflictSolver"
name = "MathOptIIS"
uuid = "8c4f8055-bd93-4160-a86b-a0c04941dbff"
version = "0.1.0"

[deps]
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"

[compat]
MathOptInterface = "1.37.0"
MathOptInterface = "1.37.0"
julia = "1.6"
32 changes: 22 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,43 @@
# 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
basic conflict solver for MathOptInterface.jl.
[MathOptIIS.jl](https://github.com/jump-dev/MathOptIIS.jl) is a
basic IIS solver for MathOptInterface.jl.

## IIS

Yes, IIS because it might mean:

1. Irreducible Infeasible Set
2. Irreducibly Inconsistent Set
3. Irreducible Infeasible Subsystem
4. Infeasible Irreducible System
5. Irreducible Inconsistent Subsystem
6. Irreducibly Inconsistent System
7. Minimal Conflict

## 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.
2 changes: 1 addition & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[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]
Expand Down
6 changes: 3 additions & 3 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -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,
)
6 changes: 3 additions & 3 deletions docs/src/index.md
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions src/MathOptConflictSolver.jl → src/MathOptIIS.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -12,4 +12,4 @@ include("bound.jl")
include("range.jl")
include("solver.jl")

end # module MathOptConflictSolver
end # module MathOptIIS
2 changes: 1 addition & 1 deletion src/iis.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/MathOptConflictSolver.jl → test/MathOptIIS.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,6 +26,6 @@ function test_1()
return
end

end # module TestMathOptConflictSolver
end # module TestMathOptIIS

TestMathOptConflictSolver.runtests()
TestMathOptIIS.runtests()
2 changes: 1 addition & 1 deletion test/iis.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module TestIIS

import HiGHS
using JuMP
import MathOptConflictSolver as MOCS
import MathOptIIS as MOCS
using Test

function runtests()
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down