commit test_drivers.py

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

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

tests/topfarm/test_topfarm.py

-'''
-Created on 17. maj 2018
-
-@author: mmpe
-'''
 from topfarm import TopFarm
 
 import numpy as np