Skip to content

Commit

Permalink
Merge pull request #19 from krr-up/nico/wip
Browse files Browse the repository at this point in the history
Nico/wip
  • Loading branch information
nrueh authored Jun 15, 2024
2 parents 4c94887 + 2664cbc commit 13467c3
Show file tree
Hide file tree
Showing 57 changed files with 184 additions and 184 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repos:
rev: v2.3.0
hooks:
- id: autoflake
args: ["--in-place", "--imports=coomsolver", "--ignore-init-module-imports", "--remove-unused-variables"]
args: ["--in-place", "--imports=coomsuite", "--ignore-init-module-imports", "--remove-unused-variables"]
exclude: ^.github/

- repo: https://github.com/pre-commit/pre-commit-hooks
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing

Thanks for considering a contribution to coomsolver. ❤️
Thanks for considering a contribution to coomsuite. ❤️

## How to get help or discuss possible contributions

Expand All @@ -12,7 +12,7 @@ To avoid duplicating issues, please search our [issue tracker][issues] and our

## How to make a contribution

- Fork the [coomsolver][project_url] repository and create a branch for your
- Fork the [coomsuite][project_url] repository and create a branch for your
changes.
- Submit a pull request to the master branch with your changes.
- Respond to feedback on your pull request.
Expand All @@ -24,8 +24,8 @@ When contributing to this project, you agree that you have authored 100% of the
content, that you have the necessary rights to the content and that the content
you contribute may be provided under the project license.

[issues]: https://github.com/krr-up/coom-solver.git/issues/
[issues]: https://github.com/krr-up/coom-suite.git/issues/
[mailing_list]: https://sourceforge.net/p/potassco/mailman/potassco-users/
[new_issue]: https://github.com/krr-up/coom-solver.git/issues/new/
[project_url]: https://github.com/krr-up/coom-solver.git/
[new_issue]: https://github.com/krr-up/coom-suite.git/issues/new/
[project_url]: https://github.com/krr-up/coom-suite.git/
[subscribe]: https://sourceforge.net/projects/potassco/lists/potassco-users/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# coomsolver
# coomsuite

## Installation

Expand All @@ -13,7 +13,7 @@ pip install .
Run the following for basic usage information:

```bash
coomsolver -h
coomsuite -h
```

## Name ideas
Expand Down
16 changes: 8 additions & 8 deletions doc/content/installation.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# Installation

coomsolver requires Python 3.8+. We recommend version 3.10.
coomsuite requires Python 3.8+. We recommend version 3.10.

You can check a successful installation by running

```console
$ coomsolver -h
$ coomsuite -h
```

## Installing with pip


The python coomsolver package can be found [here](https://github.com/krr-up/coom-solver.git/).
The python coomsuite package can be found [here](https://github.com/krr-up/coom-suite.git/).

```console
$ pip install coomsolver
$ pip install coomsuite
```

## Development

### Installing from source

The project is hosted on [github](https://github.com/krr-up/coom-solver.git/) and can
The project is hosted on [github](https://github.com/krr-up/coom-suite.git/) and can
also be installed from source.

```{warning}
Expand All @@ -32,10 +32,10 @@ We recommend this only for development purposes.
The `setuptools` package is required to run the commands below.
```

Execute the following command in the top level coomsolver directory:
Execute the following command in the top level coomsuite directory:

```console
$ git clone https://github.com/krr-up/coom-solver.git/
$ cd coomsolver
$ git clone https://github.com/krr-up/coom-suite.git/
$ cd coomsuite
$ pip install -e .[all]
```
2 changes: 1 addition & 1 deletion doc/content/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
A simple explanation on how to use the system.

```console
$ coomsolver -h
$ coomsuite -h
```

```{tip}
Expand Down
2 changes: 1 addition & 1 deletion doc/index.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# coomsolver
# coomsuite

An example project template.

Expand Down
36 changes: 18 additions & 18 deletions examples/asp/city-bike.lp
Original file line number Diff line number Diff line change
Expand Up @@ -235,53 +235,53 @@ allow("Capacity",(1,3),100).
% Cardinality constraints
% only need to check for min, not possible to exceed max as all possible objects are instantiated before
constraint(("root.color",1),"lowerbound").
path("root.color[0]","root.color").
path("root.color","root.color[0]").

constraint(("root.basket",0),"lowerbound").
path("root.basket[0]","root.basket").
path("root.basket","root.basket[0]").

constraint(("root.saddle",1),"lowerbound").
path("root.saddle[0]","root.saddle").
path("root.saddle","root.saddle[0]").

constraint(("root.frontWheel",1),"lowerbound").
path("root.frontWheel[0]","root.frontWheel").
path("root.frontWheel","root.frontWheel[0]").

constraint(("root.frontWheel[0].size",1),"lowerbound").
path("root.frontWheel[0].size[0]","root.frontWheel[0].size").
path("root.frontWheel[0].size","root.frontWheel[0].size[0]").

constraint(("root.rearWheel",1),"lowerbound").
path("root.rearWheel[0]","root.rearWheel").
path("root.rearWheel","root.rearWheel[0]").

constraint(("root.rearWheel[0].size",1),"lowerbound").
path("root.rearWheel[0].size[0]","root.rearWheel[0].size").
path("root.rearWheel[0].size","root.rearWheel[0].size[0]").

constraint(("root.carrier",1),"lowerbound").
path("root.carrier[0]","root.carrier").
path("root.carrier","root.carrier[0]").

constraint(("root.basket[0].position",1),"lowerbound").
path("root.basket[0].position[0]","root.basket[0].position").
path("root.basket[0].position","root.basket[0].position[0]").

constraint(("root.basket[0].color",1),"lowerbound").
path("root.basket[0].color[0]","root.basket[0].color").
path("root.basket[0].color","root.basket[0].color[0]").

constraint(("root.carrier[0].bag",0),"lowerbound").
path("root.carrier[0].bag[0]","root.carrier[0].bag").
path("root.carrier[0].bag[1]","root.carrier[0].bag").
path("root.carrier[0].bag","root.carrier[0].bag[0]").
path("root.carrier[0].bag","root.carrier[0].bag[1]").

constraint(("root.carrier[0].bag[0].capacity",1),"lowerbound").
path("root.carrier[0].bag[0].capacity[0]","root.carrier[0].bag[0].capacity").
path("root.carrier[0].bag[0].capacity","root.carrier[0].bag[0].capacity[0]").

constraint(("root.carrier[0].bag[0].capacity[0].volume",1),"lowerbound").
path("root.carrier[0].bag[0].capacity[0].volume[0]","root.carrier[0].bag[0].capacity[0].volume").
path("root.carrier[0].bag[0].capacity[0].volume","root.carrier[0].bag[0].capacity[0].volume[0]").

constraint(("root.carrier[0].bag[0].material",1),"lowerbound").
path("root.carrier[0].bag[0].material[0]","root.carrier[0].bag[0].material").
path("root.carrier[0].bag[0].material","root.carrier[0].bag[0].material[0]").

constraint(("root.carrier[0].bag[1].capacity",1),"lowerbound").
path("root.carrier[0].bag[1].capacity[0]","root.carrier[0].bag[1].capacity").
path("root.carrier[0].bag[1].capacity","root.carrier[0].bag[1].capacity[0]").

constraint(("root.carrier[0].bag[1].capacity[0].volume",1),"lowerbound").
path("root.carrier[0].bag[1].capacity[0].volume[0]","root.carrier[0].bag[1].capacity[0].volume").
path("root.carrier[0].bag[1].capacity[0].volume","root.carrier[0].bag[1].capacity[0].volume[0]").

constraint(("root.carrier[0].bag[1].material",1),"lowerbound").
path("root.carrier[0].bag[1].material[0]","root.carrier[0].bag[1].material").
path("root.carrier[0].bag[1].material","root.carrier[0].bag[1].material[0]").
12 changes: 6 additions & 6 deletions examples/asp/kids-bike.lp
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,19 @@ allow("Wheel",(1,3),20).
% Cardinality constraints
% only need to check for min, not possible to exceed max as all possible objects are instantiated before
constraint(("root.color",1),"lowerbound").
path("root.color[0]","root.color").
path("root.color","root.color[0]").

constraint(("root.wheelSupport",1),"lowerbound").
path("root.wheelSupport[0]","root.wheelSupport").
path("root.wheelSupport","root.wheelSupport[0]").

constraint(("root.frontWheel",1),"lowerbound").
path("root.frontWheel[0]","root.frontWheel").
path("root.frontWheel","root.frontWheel[0]").

constraint(("root.frontWheel[0].size",1),"lowerbound").
path("root.frontWheel[0].size[0]","root.frontWheel[0].size").
path("root.frontWheel[0].size","root.frontWheel[0].size[0]").

constraint(("root.rearWheel",1),"lowerbound").
path("root.rearWheel[0]","root.rearWheel").
path("root.rearWheel","root.rearWheel[0]").

constraint(("root.rearWheel[0].size",1),"lowerbound").
path("root.rearWheel[0].size[0]","root.rearWheel[0].size").
path("root.rearWheel[0].size","root.rearWheel[0].size[0]").
Loading

0 comments on commit 13467c3

Please sign in to comment.