Merge 78ef048 into fd3f649

whatsopt · May 18, 2020 · ef9058b · ef9058b
2 parents fd3f649 + 78ef048
commit ef9058b
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 21,694 deletions.
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -17,7 +17,6 @@
 @import "font_awesome5_webfont";
 @import "xdsmjs";
 @import "mda_viewer";
-@import "x3dom";
 @import "react-bootstrap-typeahead/Typeahead";
 @import "react-bootstrap-typeahead/Typeahead-bs4";
 
@@ -44,36 +43,36 @@ div.field_with_errors {
 }
 
 .alert-error {
-    background-color: #f2dede;
-    border-color: #eed3d7;
-    color: #b94a48;
-    text-align: left;
- }
+  background-color: #f2dede;
+  border-color: #eed3d7;
+  color: #b94a48;
+  text-align: left;
+}
 
 .alert-alert {
-    background-color: #f2dede;
-    border-color: #eed3d7;
-    color: #b94a48;
-    text-align: left;
+  background-color: #f2dede;
+  border-color: #eed3d7;
+  color: #b94a48;
+  text-align: left;
  }
 
 .alert-success {
-    background-color: #dff0d8;
-    border-color: #d6e9c6;
-    color: #468847;
-    text-align: left;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+  color: #468847;
+  text-align: left;
  }
 
 .alert-notice {
-    background-color: #dff0d8;
-    border-color: #d6e9c6;
-    color: #468847;
-    text-align: left;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+  color: #468847;
+  text-align: left;
  }
 
 .footer {
-		text-align: right;
-		padding-right: 5px;
+  text-align: right;
+  padding-right: 5px;
 }
 
 /* login page */
@@ -84,7 +83,7 @@ div.field_with_errors {
 }
 
 .absolute-center.is-responsive {
-  width: 50%; 
+  width: 50%;
   height: 50%;
   min-width: 200px;
   max-width: 400px;
@@ -114,13 +113,13 @@ div.field_with_errors {
 
 /* Override default xdsmjs css */
 .xdsm .driver {
-  fill: #CCCCFF;
+  fill: #ccf;
   stroke: black;
   stroke-width: 1px;
 }
 
 .xdsm2 .driver {
-  fill: #CCCCFF;
+  fill: #ccf;
   stroke: black;
   stroke-width: 1px;
-}
+}
diff --git a/app/assets/stylesheets/mda_viewer.scss b/app/assets/stylesheets/mda_viewer.scss
@@ -2,11 +2,12 @@
 table.connections td {
   padding: 2px;
 }
+
 table.connections {
   table-layout: fixed;
 }
 
-/* React table cell: give clickable widthxheight when the cell is empty*/
+/* React table cell: give clickable widthxheight when the cell is empty */
 .editable-react-table-cell {
   background-color: #f0f8e0;
 }
@@ -18,6 +19,7 @@ span.react-table-cell {
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+
 input.react-table-cell {
   width: 100%;
   box-sizing: border-box;
@@ -32,7 +34,7 @@ input.react-table-cell {
   background-color: black;
   border-radius: 10px;
   font-family: "Courier New", monospace;
-    white-space: pre;
+  white-space: pre;
 }
 
 .listing-line {
@@ -64,16 +66,19 @@ div.editor-discipline {
 
 /* XDSM tooltip */
 .tooltip-inner {
-  max-width: 300px; /* set this to your maximum fitting width */
-  width: inherit;   /* will take up least amount of space */ 
+  /* set this to your maximum fitting width */
+  max-width: 300px;
+
+  /* will take up least amount of space */
+  width: inherit;
 }
 
 /* XDSM sub-analysis link */
 a.analysis-link {
   font-style: italic;
 }
 
-/* Analysis BreadCrumbs*/
+/* Analysis BreadCrumbs */
 .breadcrumb {
   background: #fff;
   padding: 10px 15px 2px 15px !important;

diff --git a/services/tests/test_optimizer_services.py b/services/tests/test_optimizer_services.py
@@ -8,7 +8,6 @@
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol, TMultiplexedProtocol
 
-from whatsopt_server.services import ttypes as OptimimzerStoreTypes
 from whatsopt_server.services import OptimizerStore, Administration
 
 import DOE.doe_lhs as doe_lhs

diff --git a/services/tests/test_segomoe_optimizer.py b/services/tests/test_segomoe_optimizer.py
@@ -1,5 +1,4 @@
 import unittest
-import os
 import numpy as np
 from whatsopt_server.optimizer_store.segomoe_optimizer import SegomoeOptimizer
 import DOE.doe_lhs as doe_lhs

diff --git a/services/whatsopt_server/handlers/administration_handler.py b/services/whatsopt_server/handlers/administration_handler.py
@@ -1,6 +1,3 @@
-import numpy as np
-
-
 class AdministrationHandler:
     def ping(self):
         print("Optimizer server... Ping!")

diff --git a/services/whatsopt_server/handlers/optimizer_store_handler.py b/services/whatsopt_server/handlers/optimizer_store_handler.py
@@ -1,5 +1,3 @@
-import numpy as np
-
 from whatsopt_server.services import ttypes as OptimizerStoreTypes
 from whatsopt_server.optimizer_store.optimizer_store import OptimizerStore
 

diff --git a/services/whatsopt_server/optimizer_store/optimizer_store.py b/services/whatsopt_server/optimizer_store/optimizer_store.py
@@ -1,10 +1,9 @@
 import numpy as np
 import os
-from shutil import copyfile
 
 try:
     import cPickle as pickle
-except:
+except ImportError:
     import pickle
 
 from whatsopt_server.optimizer_store.segomoe_optimizer import SegomoeOptimizer

diff --git a/services/whatsopt_server/optimizer_store/segomoe_optimizer.py b/services/whatsopt_server/optimizer_store/segomoe_optimizer.py
@@ -1,8 +1,6 @@
 import os
 import sys
 import numpy as np
-import re
-import csv
 import tempfile
 import warnings
 

diff --git a/services/whatsopt_server/surrogate_store/surrogate_store.py b/services/whatsopt_server/surrogate_store/surrogate_store.py
@@ -4,19 +4,19 @@
 
 try:
     import cPickle as pickle
-except:
+except ImportError:
     import pickle
 
 SMT_NOT_INSTALLED = False
 try:
     from smt.surrogate_models import KRG, KPLS, KPLSK, LS, QP
-except:
+except ImportError:
     SMT_NOT_INSTALLED = True
 
 OPENTURNS_NOT_INSTALLED = False
 try:
     from .openturns_surrogates import PCE
-except:
+except ImportError:
     OPENTURNS_NOT_INSTALLED = True
 
 
@@ -102,4 +102,3 @@ def get_sobol_pce_sensitivity_analysis(self, pce_surrogate_id):
 
     def _sm_filename(self, surrogate_id):
         return "%s/surrogate_%s.pkl" % (self.outdir, surrogate_id)
-