Merge remote-tracking branch 'origin/master'

phuzzy/approx/doe.py

@@ -66,7 +66,7 @@ def predict(self, name=None):
         self.results_prediction = pd.DataFrame({"res": y, "alpha": self.doe_prediction.samples.alpha})
         print(1, self.results_training.head())
         print(2, self.results_prediction.head())
-        df_res = pd.concat([self.results_training, self.results_prediction[["res", "alpha"]]])
+        df_res = pd.concat([self.results_training, self.results_prediction[["res", "alpha"]]], sort=False)
 
         if name is None:
             name = "z"

phuzzy/contrib/shgo/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Stefan-Endres
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

phuzzy/contrib/shgo/__init__.py

@@ -0,0 +1,7 @@
+# Simplicial Homology Global Optimization https://stefan-endres.github.io/shgo
+# https://github.com/Stefan-Endres/shgo
+
+from phuzzy.contrib.shgo.shgo_m.triangulation import *
+from phuzzy.contrib.shgo._shgo import shgo
+
+__all__ = [s for s in dir() if not s.startswith('_')]