diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 4429997..641f2b6 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -10,19 +10,19 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true - python-version: ${{ matrix.python-version }} + python-version: ${{ 3.9 }} - name: Conda install clingo shell: bash -l {0} run: | - conda install -c potassco clingo==5.5.2 + conda install -c potassco clingo==5.6.2 - name: Conda install clingo-dl shell: bash -l {0} run: | - conda install -c potassco clingo-dl==1.3.0 + conda install -c potassco clingo-dl==1.4.0 - name: Conda install clingcon shell: bash -l {0} run: | - conda install -c potassco clingcon==5.0.0 + conda install -c potassco clingcon==5.2.0 - name: Build run: | export CLINGO_LIBRARY_PATH=/usr/share/miniconda/envs/test/lib @@ -41,19 +41,19 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true - python-version: ${{ matrix.python-version }} + python-version: ${{ 3.9 }} - name: Conda install clingo shell: bash -l {0} run: | - conda install -c potassco clingo==5.5.2 + conda install -c potassco clingo==5.6.2 - name: Conda install clingo-dl shell: bash -l {0} run: | - conda install -c potassco clingo-dl==1.3.0 + conda install -c potassco clingo-dl==1.4.0 - name: Conda install clingcon shell: bash -l {0} run: | - conda install -c potassco clingcon==5.0.0 + conda install -c potassco clingcon==5.2.0 - name: Build run: | export CLINGO_LIBRARY_PATH=/usr/local/miniconda/envs/test/lib diff --git a/Cargo.toml b/Cargo.toml index 9d6054f..dcd3b25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" publish = false [dependencies] -clingo = "0.7.0" +clingo = "=0.8.0" clingo-dl-plugin = { git = "https://github.com/potassco/clingo-dl-theory-rs", branch = "master" } clingcon-plugin = { git = "https://github.com/potassco/clingcon-theory-rs", branch = "master" } rocket = { version = "0.5.0-rc.2", features = ["json"] } @@ -16,5 +16,3 @@ libloading = "0.7" serde = "1.0" serde_json = "1.0" serde_derive = "1.0" - - diff --git a/src/utils.rs b/src/utils.rs index 7b98919..812339c 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,12 +1,12 @@ use clingcon_plugin::ConTheory; use clingo::{ - ast, control, ClingoError, Configuration, ConfigurationType, Control, Id, Model, Part, - ShowType, SolveHandle, SolveHandleWithEventHandler, SolveMode, SolverLiteral, Statistics, - StatisticsType, Symbol, SymbolicAtoms, TruthValue, + ast, control, ClingoError, Configuration, ConfigurationType, Control, DefaultCtx, + GenericSolveHandle, Id, Model, Part, ShowType, SolveHandle, SolveMode, SolverLiteral, + Statistics, StatisticsType, Symbol, SymbolicAtoms, TruthValue, }; use clingo_dl_plugin::DLTheory; -type DLSolveHandle = SolveHandleWithEventHandler; -type ConSolveHandle = SolveHandleWithEventHandler; +type DLSolveHandle = GenericSolveHandle; +type ConSolveHandle = GenericSolveHandle; use clingo::theory::Theory; use rocket::response::{self, Responder}; use rocket::serde::json::Json; diff --git a/taskassignment.lp b/taskassignment.lp index ecc44fb..2315bb5 100644 --- a/taskassignment.lp +++ b/taskassignment.lp @@ -14,7 +14,7 @@ seq((T2,ST2),(T1,ST1),Time2) :- assign(T1,ST1,M), assign(T2,ST2,M), T1