summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNao Pross <np@0hm.ch>2023-11-16 22:34:01 +0100
committerNao Pross <np@0hm.ch>2023-11-16 22:34:01 +0100
commitebdeea55438db5da1f27824e084f1a21534f853b (patch)
treed95054e7d0c4b581be62d02db04abd7f5fe2b387
parentFix bug when uptolevel is None (diff)
parentmisc (diff)
downloadact4e-ebdeea55438db5da1f27824e084f1a21534f853b.tar.gz
act4e-ebdeea55438db5da1f27824e084f1a21534f853b.zip
Merge remote-tracking branch 'template/alphubel-prod' into alphubel-prod
-rw-r--r--.devcontainer/devcontainer.json6
-rw-r--r--.devcontainer/requirements.txt4
-rw-r--r--MANIFEST.in7
-rw-r--r--Makefile1
-rw-r--r--README.md1
-rw-r--r--src/act4e_solutions/currency_ex.py12
6 files changed, 24 insertions, 7 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c3fc20e..0754889 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -34,7 +34,7 @@
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-python.python",
- "tht13.html-preview-vscode",
+ "tht13.html-preview-vscode"
// "ms-python.vscode-pylance"
],
@@ -47,7 +47,7 @@
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
"features": {
- "git": "os-provided",
- "git-lfs": "latest"
+ "git": "os-provided"
+ //"git-lfs": "latest"
}
}
diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt
index 28fee9e..e36b067 100644
--- a/.devcontainer/requirements.txt
+++ b/.devcontainer/requirements.txt
@@ -1,2 +1,2 @@
-ACT4E-exercises
-pre-commit \ No newline at end of file
+ACT4E-exercises>=7.3.2310261331
+pre-commit
diff --git a/MANIFEST.in b/MANIFEST.in
index 4e280e6..be06279 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,8 +12,15 @@ exclude LICENSE*
prune .*
exclude .*
exclude src/conf.py
+recursive-exclude src *.rst
+recursive-exclude src *.less
+recursive-include src *.css
+recursive-include src *.sql
+recursive-include src py.typed
prune src/**/__pycache__
prune src/*_tests*
prune out
+prune assets
#@ add local below
+
diff --git a/Makefile b/Makefile
index 300e14b..68d3fe1 100644
--- a/Makefile
+++ b/Makefile
@@ -24,4 +24,3 @@ check-latest: Homeworks.md build
# check-%:
# act4e-test --collections act4e_checks --module act4e_solutions --group $*
-
diff --git a/README.md b/README.md
index 834018f..c24aaf4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-[![Open in Visual Studio Code](https://classroom.github.com/assets/open-in-vscode-718a45dd9cf7e7f842a935f5ebbe5719a5e09af4491e668f4dbf3b35d5cca122.svg)](https://classroom.github.com/online_ide?assignment_repo_id=12208909&assignment_repo_type=AssignmentRepo)
## Setup
### Install Docker
diff --git a/src/act4e_solutions/currency_ex.py b/src/act4e_solutions/currency_ex.py
new file mode 100644
index 0000000..c0b6b1b
--- /dev/null
+++ b/src/act4e_solutions/currency_ex.py
@@ -0,0 +1,12 @@
+import act4e_interfaces as I
+
+
+class SolCurrencyOptimization(I.CurrencyOptimization):
+ def compute_optimal_conversion(
+ self,
+ available: I.SemiCategory[I.RichObject[str], I.RichMorphism[I.CurrencyExchanger]],
+ source: str,
+ amount: float,
+ target: str,
+ ) -> I.OptimalSolution:
+ pass