Create new api for NIMBUS

Fixes #11
industrial-optimization-group · Jan 27, 2024 · 3fe7cbe · 3fe7cbe
1 parent 281fe4f
commit 3fe7cbe
Show file tree

Hide file tree

Showing 5 changed files with 553 additions and 21 deletions.
diff --git a/LUKE best front.csv b/LUKE best front.csv
@@ -0,0 +1,142 @@
+npv4%               ,SV30                ,removal1            ,removal2            ,removal3            ,dummy
+max,max,max,max,max,var
+-1.43181E+11,-1385313588,-1822843650,-826674151.5,-1062581206,1
+-1.06682E+11,-5130174379,-115407634.5,-15457198.81,-3798958.49,1
+-1.37406E+11,-662648930.9,-1948668143,-634974365.4,-1378500686,1
+-1.24318E+11,-170340782.9,-18055990.55,-3487006420,-638888192.6,1
+-1.11526E+11,1233012925.9199994  ,-22797924.96,-19563760.88,-5708832886,1
+-1.37102E+11,-2231378767,-1069170660,-1905523458,-2194423.7,1
+-1.37456E+11,-2970267173,-1293362325,-1151468334,-2194145.6,1
+-1.31604E+11,-2685242296,-1206870366,-2317605.25,-1613952639,1
+-1.27839E+11,-1778291767,-931817868.3,-2194071.85,-2702795317,1
+-1.31356E+11,-2630641685,-546778903,-2118196017,-2194145.6,1
+-1.28139E+11,-2507862734,-536323798.6,-889286243.3,-1454871319,1
+-1.24635E+11,-1896718753,-631559346.2,-3512260.25,-2809188573,1
+-1.26038E+11,-2141348733,-125684167.7,-1850264867,-1126321040,1
+-1.23788E+11,-1749112002,-405870252.7,-473842756.1,-2676805007,1
+-1.22331E+11,-1355445335,-56535506.12,-1419867779,-2323579116,1
+-1.35899E+11,-629666161.5,-1189176792,-2116103671,-596876983.2,1
+-1.39288E+11,-874201631,-1301000200,-1156252650,-1891987630,1
+-1.3252E+11,-553578737.8,-1203826174,-1451055.41,-3506658737,1
+-1.33623E+11,-638295560.6,-585959410.1,-2188393364,-1680421756,1
+-1.28208E+11,-398566811.3,-513169117.3,-895208736,-3367640972,1
+-1.25997E+11,-12940185.3,-79695107.22,-1845876882,-3021803432,1
+-1.35307E+11,460866955.5400055   ,-1186220907,-2110462913,-1552910241,1
+-1.3542E+11,709175982.0499891   ,-1175282935,-928873862.8,-3422801331,1
+-1.29351E+11,745744571.7,-433600501,-1913469841,-3132598160,1
+-1.34889E+11,631159521.3999939   ,-949743961.9,-1683532575,-2756146293,1
+-1.37113E+11,-2235697021,-1070482966,-1901526494,-2194423.7,1
+-1.3443E+11,-2311284037,-1093555525,-781190847,-1278581527,1
+-1.27839E+11,-1778291767,-931817868.3,-2194071.85,-2702795317,1
+-1.28938E+11,-2070992513,-377111095.3,-1811456067,-1063050087,1
+-1.20088E+11,-1794965304,-293357921.3,-498243122,-2717758923,1
+-1.22329E+11,-1355625513,-56553613.48,-1419485143,-2323750735,1
+-1.3803E+11,-318598340.1,-1132374832,-2013220988,-1393704463,1
+-1.34521E+11,-158103528.7,-1083790386,-763523214.6,-3151988785,1
+-1.28986E+11,81931474.86000235   ,-367379136.7,-1793870469,-2936720483,1
+-1.34889E+11,631159521.3999939   ,-949743961.9,-1683532575,-2756146293,1
+-1.36606E+11,-1834065204,-948870434.9,-1681689200,-850615252.7,1
+-1.29301E+11,-1597718597,-877034996.6,-390280449.6,-2540854431,1
+-1.23945E+11,-1340511929,-155502617.8,-1411347991,-2310193108,1
+-1.35559E+11,345305629.4900028   ,-930946797.6,-1649577995,-2700519840,1
+-1.32306E+11,-1136989046,-737372755.8,-1299713849,-2127676371,1
+-1.32321E+11,-1133027275,-736020327.8,-1306318819,-2125116081,1
+-1.22329E+11,-1355625513,-56553613.48,-1419485143,-2323750735,1
+-1.34891E+11,631071258.0299939   ,-949743245.3,-1683532622,-2756151855,1
+-1.27839E+11,-1778291767,-931817868.3,-2194071.85,-2702795317,1
+-1.3752E+11,-2160390590,-1047708917,-1860369288,-192350513.7,1
+-1.22329E+11,-1355625513,-56553613.48,-1419485143,-2323750735,1
+-1.27839E+11,-1778291767,-931817868.3,-2194071.85,-2702795317,1
+-1.37113E+11,-2235697021,-1070482966,-1901526494,-2194423.7,1
+-1.24634E+11,-1896771597,-631555553.2,-3512260.25,-2809118742,1
+-1.30835E+11,713724889.5,-563708644.4,-1857880807,-3041587069,1
+-1.38107E+11,-754810895.5,-1103917443,-1526075614,-1784915392,1
+-1.32013E+11,-321046002.6,-731015806.1,-1288457970,-2822565154,1
+-1.26574E+11,-2234990969,-144725011.7,-1901266639,-972455394,1
+-1.26493E+11,165374506.23000374  ,-92552084.07,-1893356760,-3099666878,1
+-1.17849E+11,-1720165379,-65743717.96,-747825271.7,-2650689589,1
+-1.29876E+11,-1840881602,-468132406.6,-1685332025,-1332272407,1
+-1.36684E+11,-984234555.6,-1173346514,-2087152315,-563642732.9,1
+-1.34006E+11,-2020289889,-1005330155,-912244465,-1493188969,1
+-1.20327E+11,-1964280363,-505644671.9,-10049691.56,-2869723397,1
+-1.23493E+11,-1640946306,-407510774.8,-704412793.4,-2579645979,1
+-1.35518E+11,268466241.48000085  ,-1189268564,-2115975040,-1324168616,1
+-1.35392E+11,689497714.6199923   ,-1119631236,-1118826334,-3258248163,1
+-1.30471E+11,-2673810032,-479457759.4,-2141491635,-2194145.6,1
+-1.37011E+11,-2539841136,-1162821340,-1196846141,-532472648.7,1
+-1.32083E+11,-2789773263,-1238699711,-26588221.82,-1469951470,1
+-1.32986E+11,-388809631.9,-1234162627,-18477067.39,-3596666576,1
+-1.34726E+11,-33000695.62,-1126210938,-694982680.3,-3277570965,1
+-1.28511E+11,237711454.1400056   ,-320058949,-1853726427,-3034786872,1
+-1.36386E+11,-93757869.74,-903448067.4,-2035488041,-1905399079,1
+-1.28442E+11,-2185177582,-331282451,-1873827227,-927757836.6,1
+-1.28181E+11,-128503935.1,-431403124.1,-1183031284,-3363220046,1
+-1.27307E+11,-2362804560,-556451508.6,-664076136.6,-1800351162,1
+-1.32108E+11,-1567795324,-1109156693,-228571084.6,-2514015485,1
+-1.24284E+11,-1165978047,-52510972.11,-1751349342,-2153660948,1
+-1.31793E+11,-501353189.2,-544287336.6,-1822894829,-2270939834,1
+-1.26684E+11,-1458522902,-354136015.5,-1040153325,-2416017153,1
+-1.35707E+11,-779569609,-1189278108,-2115987352,-456904931.9,1
+-1.34493E+11,371031878.9100036   ,-762373992.3,-2216402326,-2201900115,1
+-1.26571E+11,-2234322912,-751713717.3,-3758088.21,-2398464278,1
+-1.35281E+11,-2394430162,-877359324.8,-1988640991,-2194423.7,1
+-1.37209E+11,-1118656564,-973098656,-1725315705,-1397890119,1
+-1.3922E+11,189308329.7000036   ,-1300169751,-1444670025,-2364866557,1
+-1.28269E+11,-939401375.2,-194622093.3,-2062916337,-1950475157,1
+-1.31366E+11,-1313245775,-790745450.1,-960516788.7,-2285741906,1
+-1.2814E+11,-917227643,-673221116.9,-307898828.9,-3357233589,1
+-1.37321E+11,-2972377493,-1294046205,-998019601,-207143183.7,1
+-1.35748E+11,567337989.7199997   ,-1051832258,-1867803808,-2344505828,1
+-1.37028E+11,276950234.7100056   ,-1032188213,-1832331246,-2286270563,1
+-1.35699E+11,-1663909934,-897088159.5,-1588344557,-1173562633,1
+-1.35668E+11,-1274311666,-778995924.4,-2246273660,-824161150.1,1
+-1.33525E+11,-3620204332,-1312693850,-4840089.56,-588902908.4,1
+-1.35214E+11,695094616.4599943   ,-1321651649,-24548399.2,-4229306178,1
+-1.34999E+11,394449589.12999886  ,-614067317.5,-2502681332,-1945687457,1
+-1.385E+11,-978665892.8,-1829151750,-1238471007,-628370640.4,1
+-1.36608E+11,-661792539.4,-1313110997,-1957747358,-616883985.7,1
+-1.35486E+11,-1372985493,-622646614.1,-2627384571,-258685182.6,1
+-1.36813E+11,-2886220877,-1003032249,-1324671958,-184368740,1
+-1.33918E+11,-1619758079,-1167268252,-4158828.46,-2578977006,1
+-1.41883E+11,-1475509301,-1946943751,-748521809.5,-816420060.8,1
+-1.35862E+11,689087150.7299924   ,-1099742339,-681870801.9,-3751682423,1
+-1.32584E+11,-383924335.5,-598740930.2,-2817749667,-696409174.5,1
+-1.35572E+11,-3878211298,-1492929276,-113423849.5,-33654349.26,1
+-1.3847E+11,-150688591.1,-1094818950,-1121769882,-2688005104,1
+-1.3696E+11,341284634.24000216  ,-1431729736,-7812135.07,-3899764282,1
+-1.25754E+11,-4373943455,-827551201.3,-291640631.4,-17653239.18,1
+-1.36691E+11,-2449661058,-1424751925,-5351324.24,-1566350661,1
+-1.39591E+11,497154514.84999925  ,-1866986169,-971705711.8,-2245241299,1
+-1.24384E+11,-3164156600,-704826786.5,-3779299.02,-1571050076,1
+-1.35933E+11,-562674480.5,-605286790.7,-2440113402,-1323154544,1
+-1.38016E+11,-1710773758,-1068711375,-1074617632,-1474074429,1
+-1.26711E+11,903790414.0799905   ,-743549204.2,-14970701.84,-4956553047,1
+-1.37064E+11,484468156.0799987   ,-890974714.8,-1779849095,-2608760446,1
+-1.37784E+11,-797694577.6,-1577667633,-1607380887,-617838964.9,1
+-1.39422E+11,-932283062.9,-1462903553,-301056670.3,-2560758890,1
+-1.29579E+11,823060728.3899903   ,-523982813.9,-1118882526,-3952960416,1
+-1.35033E+11,-679701855.1,-551557773,-2735590461,-788991459,1
+-1.34356E+11,718541782.1199945   ,-1254951985,-15486160.22,-4323478955,1
+-1.3767E+11,-2718891952,-1289073064,-558750352.2,-884171992.3,1
+-1.39746E+11,-2383046605,-1948667573,-179424793.7,-654420933.6,1
+-1.35416E+11,-364484146.3,-591276355.1,-2681955506,-1075604496,1
+-1.37107E+11,-2453337812,-892506531.5,-1884236425,-29281217.81,1
+-1.38295E+11,-599519709.7,-1173448174,-2085254714,-814968668.4,1
+-1.306E+11,-274636919.9,-935112749.7,-2880850.69,-3947191477,1
+-1.30656E+11,420228730.0199975   ,-229528507,-3040404198,-1712101713,1
+-1.39988E+11,-1513257296,-1291752270,-1479946090,-959153304.2,1
+-1.40359E+11,-476457442.3,-1195488902,-1403473561,-1984772862,1
+-1.35129E+11,228005254.7100049   ,-637901589.3,-1931289622,-2560651561,1
+-1.33493E+11,-3578670775,-1001224976,-865283938.3,-19785183.05,1
+-1.37366E+11,-729097018,-1472031006,-1749698206,-626122572.4,1
+-1.34142E+11,-493270501.2,-937203939.3,-2430006940,-626317895.6,1
+-1.33924E+11,630238208.8,-658948585.8,-1678068687,-3083496453,1
+-1.36708E+11,-1623452924,-740108693.7,-1967838377,-880440309.3,1
+-1.41482E+11,-866276878.2,-1882835146,-178803909.9,-2169979654,1
+-1.40981E+11,-1295462600,-1859236507,-223677168.5,-1850683695,1
+-1.39334E+11,-1102319154,-1947086880,-918484406.6,-773451812.4,1
+-1.29341E+11,-3136660743,-570643539.1,-1167737489,-546990356.5,1
+-1.33233E+11,-2627606708,-1020998020,-397897251.6,-1404498712,1
+-1.3653E+11,232096528.62000242  ,-1080899341,-712912625.7,-3447307994,1
+-1.39762E+11,292789616.7700043   ,-1901779813,-188184193.1,-3059534898,1
+-1.37086E+11,-622306712.9,-1340339351,-1921185524,-684250996.9,1
diff --git a/app.py b/app.py
@@ -39,6 +39,7 @@
     user_resources,
     solution_archive_resources,
     log_resources,
+    nimbus,
 )  # noqa: E402
 
 # import views
@@ -72,6 +73,10 @@ def check_if_token_revoked(jwt_header, jwt_payload):
 api.add_resource(method_resources.MethodCreate, "/method/create")
 api.add_resource(method_resources.MethodControl, "/method/control")
 
+# Add nimbus endpoints
+
+api.add_resource(nimbus.Iterate, "/nimbus/iterate")
+
 # Add questionnaire endpoints
 api.add_resource(
     questionnaire_resources.QuestionnaireAfterSolutionProcess, "/questionnaire/after"
@@ -80,9 +85,13 @@ def check_if_token_revoked(jwt_header, jwt_payload):
     questionnaire_resources.QuestionnaireDuringSolutionProcess, "/questionnaire/during"
 )
 api.add_resource(
-    questionnaire_resources.QuestionnaireDuringSolutionProcessFirstIteration, "/questionnaire/during/first"
+    questionnaire_resources.QuestionnaireDuringSolutionProcessFirstIteration,
+    "/questionnaire/during/first",
+)
+api.add_resource(
+    questionnaire_resources.QuestionnaireDuringSolutionProcessAfterNew,
+    "/questionnaire/during/new",
 )
-api.add_resource(questionnaire_resources.QuestionnaireDuringSolutionProcessAfterNew, "/questionnaire/during/new")
 
 # Add archive endpoint
 api.add_resource(solution_archive_resources.Archive, "/archive")

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,6 +36,96 @@ sphinx-rtd-theme = "^0.5.1"
 pytest = "^6.2.3"
 matplotlib = "^3.4.2"
 
+[tool.ruff]
+# Enable the pycodestyle (`E`) and Pyflakes (`F`) rules by default.
+# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
+# McCabe complexity (`C901`) by default.
+select = [
+    "E",
+    "F",
+    "W",
+    "C901",
+    "D",
+    "UP",
+    "S",
+    "FBT",
+    "B",
+    "A",
+    "COM",
+    "C4",
+    "T20",
+    "PIE",
+    "RET",
+    "PTH",
+    "TD",  # Comment this out if too annoying
+    "FIX",  # Comment this out if too annoying
+    "SIM",
+    "PL",
+    "TRY",
+    "FURB",
+    "LOG",
+    "NPY",
+    "RUF",
+    "I",
+    "N",
+]
+ignore = [
+	"COM812", # Enforcing trailing commas is too annoying.
+	"PLR0915", # "too many statements (>50)"
+	"T201", # allow print statements
+]  
+pydocstyle.convention = "google"
+
+
+# Allow autofix for all enabled rules (when `--fix`) is provided.
+fixable = []
+unfixable = []
+
+# Exclude a variety of commonly ignored directories.
+exclude = [
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".git-rewrite",
+    ".hg",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "venv",
+]
+
+line-length = 120
+
+# Allow unused variables when underscore-prefixed.
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+# Assume Python 3.11.
+target-version = "py312"
+
+[tool.ruff.per-file-ignores]
+# Ignore certain rules in test files
+"tests/**/*.py" = [
+    "S101", # asserts allowed in tests...
+    "ARG", # Unused function args -> fixtures nevertheless are functionally relevant...
+    "FBT", # Don't care about booleans as positional arguments in tests, e.g. via @pytest.mark.parametrize()
+    "PLR2004", # Magic value used in comparison, ...
+]
+
+[tool.ruff.format]
+quote-style = "double"
+
 [tool.poetry.group.dev.dependencies]
 pytest-rerunfailures = "^11.1.2"