From 91c1b125c5af79a621273cadad7f6d87bffbe7a4 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Thu, 14 Jun 2018 13:31:52 +0200
Subject: [PATCH] commit test_drivers.py
---
docker/Dockerfile | 20 ++++++++++----------
tests/topfarm/test_drivers.py | 11 ++++++++---
tests/topfarm/test_topfarm.py | 5 -----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 70c74e9c..1c2d2bad 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -67,9 +67,9 @@ RUN python setup.py install
# Add Tini. Tini operates as a process subreaper for jupyter. This prevents
# kernel crashes.
-#ENV TINI_VERSION v0.6.0
-#ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
-#RUN chmod +x /usr/bin/tini
+ENV TINI_VERSION v0.6.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
+RUN chmod +x /usr/bin/tini
# Install the Colonel
@@ -83,15 +83,15 @@ RUN apt-get clean \
&& apt-get autoremove -y
#RUN mkdir /install
-RUN mkdir /install/source
-RUN mkdir /install/FugaLib
-WORKDIR /install
-COPY topfarm/cost_models/fuga/Colonel/source/*.pas /install/source/
-COPY topfarm/cost_models/fuga/Colonel/FugaLib/FugaLib.lpr /install/FugaLib/
-COPY topfarm/cost_models/fuga/Colonel/FugaLib/FugaLib.lpi /install/FugaLib
+#RUN mkdir /install/source
+#RUN mkdir /install/FugaLib
+#WORKDIR /install
+#COPY topfarm/cost_models/fuga/Colonel/source/*.pas /install/source/
+#COPY topfarm/cost_models/fuga/Colonel/FugaLib/FugaLib.lpr /install/FugaLib/
+#COPY topfarm/cost_models/fuga/Colonel/FugaLib/FugaLib.lpi /install/FugaLib
## Build
-RUN lazbuild /install/FugaLib/FugaLib.lpr
+#RUN lazbuild /install/FugaLib/FugaLib.lpr
#RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
#RUN apt-get update -y && apt-get install -y nodejs
diff --git a/tests/topfarm/test_drivers.py b/tests/topfarm/test_drivers.py
index 718db758..6241ede3 100644
--- a/tests/topfarm/test_drivers.py
+++ b/tests/topfarm/test_drivers.py
@@ -9,7 +9,8 @@ import numpy as np
import pytest
from topfarm.cost_models.dummy import DummyCost, DummyCostPlotComp
from topfarm.plotting import NoPlot
-from topfarm.easy_drivers import EasyScipyOptimizeDriver, EasySimpleGADriver
+from topfarm.easy_drivers import EasyScipyOptimizeDriver, EasySimpleGADriver,\
+ EasyPyOptSparseSLSQP, EasyPyOptSparseIPOPT
initial = [[6, 0], [6, -8], [1, 1]] # initial turbine layouts
@@ -59,9 +60,13 @@ def topfarm_generator():
(EasyScipyOptimizeDriver(tol=1e-3), 1e-2),
(EasyScipyOptimizeDriver(maxiter=13), 1e-1),
(EasyScipyOptimizeDriver(optimizer='COBYLA', tol=1e-3), 1e-2),
- #(EasyPyOptSparseSLSQP(),??),
- (EasySimpleGADriver(), 1e-4)][-1:])
+ (EasyPyOptSparseSLSQP(),1e-4),
+ (EasyPyOptSparseIPOPT(),1e-4),
+ #(EasySimpleGADriver(), 1e-4)
+ ][-1:])
def test_optimizers(driver, tol, topfarm_generator):
+ if isinstance(driver, str):
+ pytest.xfail("reason")
tf = topfarm_generator(driver)
tf.optimize()
tb_pos = tf.turbine_positions
diff --git a/tests/topfarm/test_topfarm.py b/tests/topfarm/test_topfarm.py
index a8758a4b..dd8d02ab 100644
--- a/tests/topfarm/test_topfarm.py
+++ b/tests/topfarm/test_topfarm.py
@@ -1,8 +1,3 @@
-'''
-Created on 17. maj 2018
-
-@author: mmpe
-'''
from topfarm import TopFarm
import numpy as np
--
GitLab