From 0bc695b19a7b7a50323471fecf793b4331372ace Mon Sep 17 00:00:00 2001
From: Hanno Becker <hannobecker@posteo.de>
Date: Tue, 26 Dec 2023 07:22:52 +0000
Subject: [PATCH] Update Dockerfile, README, and OR-Tools script

---
 README.md                        | 16 +++++++++-------
 paper/artifact/slothy.Dockerfile |  2 +-
 submodules/setup-ortools.sh      |  3 ---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 325adea9..ac3ab534 100644
--- a/README.md
+++ b/README.md
@@ -48,14 +48,10 @@ can be found in [paper/artifact/slothy.dockerfile](paper/artifact/slothy.dockerf
 ### Manual
 
 SLOTHY relies on [Google OR-Tools](https://developers.google.com/optimization) as the underlying constraint
-solver. You need at least v9.3, and this repository by default uses v9.7.
-
-Unless you already have a working installation, you can clone Google OR-Tools as a submodule of this repository
-and build from scratch, e.g. as follows (also available as [submodules/setup-ortools.sh](submodules/setup-ortools.sh)
-for convenience):
+solver. You need at least v9.3, and this repository by default uses v9.7. Unless you already have a working
+installation, you can clone Google OR-Tools as a submodule of this repository and build from scratch, e.g. as follows:
 
 ```
-% apt install -y git build-essential python3-pip cmake swig
 % git submodule init
 % git submodule update
 % cd submodules/or-tools
@@ -65,7 +61,13 @@ for convenience):
 % make -C build -j8
 ```
 
-You also need to install `sympy`. To add it to the virtual Python environment provided by OR-Tools, do
+This is also available as [submodules/setup-ortools.sh](submodules/setup-ortools.sh)
+for convenience.
+
+**Dependencies:** You need `git`, `python3-pip`, `cmake`, `swig`, and build-tools (e.g. `build-essential`)
+to build OR-Tools from source.
+
+You also need `sympy`. To add it to the virtual Python environment provided by OR-Tools, do
 ```
 > source submodules/or-tools/build/python/venv/bin/activate
 > pip3 install sympy
diff --git a/paper/artifact/slothy.Dockerfile b/paper/artifact/slothy.Dockerfile
index ae50ccc1..9242abbd 100644
--- a/paper/artifact/slothy.Dockerfile
+++ b/paper/artifact/slothy.Dockerfile
@@ -9,7 +9,7 @@ RUN passwd -d ubuntu
 USER ubuntu
 WORKDIR /home/ubuntu
 # Fetching repositories as zips; could use git clone as well
-RUN wget https://github.com/slothy-optimizer/slothy/archive/refs/heads/ches2024_artifact.zip -O slothy.zip
+RUN wget https://github.com/slothy-optimizer/slothy/archive/refs/heads/main.zip -O slothy.zip
 RUN wget https://github.com/slothy-optimizer/pqmx/archive/refs/heads/ches2024_artifact.zip -O pqmx.zip
 RUN wget https://github.com/slothy-optimizer/pqax/archive/refs/heads/ches2024_artifact.zip -O pqax.zip
 RUN unzip slothy.zip
diff --git a/submodules/setup-ortools.sh b/submodules/setup-ortools.sh
index 55ae7c35..a7a49444 100755
--- a/submodules/setup-ortools.sh
+++ b/submodules/setup-ortools.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env sh
 
-# Install some dependencies
-apt install -y git build-essential python3-pip cmake swig
-
 git submodule init
 git submodule update