chore(deps-dev): bump pygments from 2.4.1 to 2.7.4

.vscode/cspell.json

@@ -73,6 +73,7 @@
         "denormalize",
         "deps",
         "devtools",
+        "dicttoolz",
         "DISQUS",
         "docx",
         "downscaled",
@@ -113,6 +114,7 @@
         "Gohlke's",
         "graphtik",
         "graphtik's",
+        "graphtiked",
         "graphviz",
         "groupby",
         "GRPE",
@@ -121,6 +123,7 @@
         "gwot",
         "gwots",
         "harmonised",
+        "hcat",
         "hstack",
         "idgears",
         "ified",
@@ -203,6 +206,7 @@
         "pandel",
         "Pavlovic",
         "perma",
+        "Phasings",
         "pidx",
         "plotly",
         "POSIX",
@@ -262,6 +266,7 @@
         "vals",
         "vararg",
         "varargs",
+        "vcat",
         "vectorize",
         "vehdata",
         "vehdb",

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-    "python.pythonPath": ".venv/bin/python3",
+    "python.pythonPath": ".venv/bin/python",
     "python.linting.enabled": true,
     "python.testing.unittestEnabled": false,
     "python.testing.nosetestsEnabled": false,

Notebooks/CarsDB-accdb.py

@@ -6,7 +6,7 @@
 #       extension: .py
 #       format_name: percent
 #       format_version: '1.3'
-#       jupytext_version: 1.3.4
+#       jupytext_version: 1.6.0
 #   kernelspec:
 #     display_name: Python 3
 #     language: python
@@ -90,7 +90,7 @@
 # %%
 ## UNCOMMENT next command & run to DELETE the db-file, and rebuild it.
 if not skip_h5_write and del_h5_on_start:
-#     !rm -f {h5fname}
+    # !rm -f {h5fname}
 
 # %%
 vehdb.print_nodes(h5fname)
@@ -359,8 +359,8 @@ def store_results_per_car(
 #
 # !ls -lh {h5fname}
 if not skip_h5_write:
-#     !ptrepack  {h5fname}  --complevel=9 --complib=blosc:lz4hc -o {h5fname}.tmp
-#     !mv  {h5fname}.tmp {h5fname}
+    # !ptrepack  {h5fname}  --complevel=9 --complib=blosc:lz4hc -o {h5fname}.tmp
+    # !mv  {h5fname}.tmp {h5fname}
 # !ls -lh {h5fname}
 
 # %%

Notebooks/CarsDB-compare.py

@@ -6,7 +6,7 @@
 #       extension: .py
 #       format_name: percent
 #       format_version: '1.3'
-#       jupytext_version: 1.4.1
+#       jupytext_version: 1.6.0
 #   kernelspec:
 #     display_name: Python 3
 #     language: python

Notebooks/CarsDB-pyalgo.py

@@ -6,7 +6,7 @@
 #       extension: .py
 #       format_name: percent
 #       format_version: '1.3'
-#       jupytext_version: 1.3.4
+#       jupytext_version: 1.6.0
 #   kernelspec:
 #     display_name: Python 3
 #     language: python
@@ -72,7 +72,7 @@
 # %%
 ## UNCOMMENT next command & run to DELETE the db-file, and rebuild it.
 if del_h5_on_start:
-#     !rm -f {out_h5fname}
+    # !rm -f {out_h5fname}
 
 # %%
 vehdb.print_nodes(out_h5fname)
@@ -158,7 +158,7 @@ def store_or_compare_vehicle(*args, **kw):
 
 
 with vehdb.openh5(inp_h5fname) as inph5, vehdb.openh5(out_h5fname, mode="a") as outh5:
-    % time store_or_compare_python_results(
+    %time store_or_compare_python_results(
         inph5, outh5, force_write=force_h5_write, vehicle_nums=vehnums_to_run  #[41]
     )
 
@@ -170,7 +170,7 @@ def store_or_compare_vehicle(*args, **kw):
 if not skip_h5_write:
     ## COMPRESS x2.3 HDF5: 269Mb-->119Mb in ~20s.
     #
-#     !ls -lh {out_h5fname}
-#     !ptrepack  {out_h5fname}  --complevel=9 --complib=blosc:lz4hc -o {out_h5fname}.tmp
-#     !mv  {out_h5fname}.tmp {out_h5fname}
-#     !ls -lh {out_h5fname}
+    # !ls -lh {out_h5fname}
+    # !ptrepack  {out_h5fname}  --complevel=9 --complib=blosc:lz4hc -o {out_h5fname}.tmp
+    # !mv  {out_h5fname}.tmp {out_h5fname}
+    # !ls -lh {out_h5fname}

Notebooks/Cycler.py

@@ -6,7 +6,7 @@
 #       extension: .py
 #       format_name: percent
 #       format_version: '1.3'
-#       jupytext_version: 1.3.4
+#       jupytext_version: 1.6.0
 #   kernelspec:
 #     display_name: Python 3
 #     language: python
@@ -107,7 +107,7 @@
 cb.cycle = pm.add_class_phase_markers(cb.cycle, wltc_parts)
 
 # %%
-cb.cycle = pm.add_phase_markers(cb.cycle, cb.V, cb.A)
+cb.cycle = pm.add_transition_markers(cb.cycle, cb.V, cb.A)
 cb.cycle.select_dtypes(bool).sum()
 
 # %%
@@ -125,14 +125,14 @@
 c = wio.pstep_factory.get().cycle
 
 ng = 6
-n95_high = engine.calc_n_95(wot, mdl["n_rated"], mdl["p_rated"])[0]
+n95_high = engine.calc_n95(wot, mdl["n_rated"], mdl["p_rated"])[0]
 v_max_cycle = cb.V.max()
 vmax_rec = vmax.calc_v_max(gwots)
 g_vmax = vmax_rec.g_vmax
 n2v_vmax = n2vs[g_vmax - 1]
 n_max_cycle = v_max_cycle * n2v_vmax
 n_max_cycle = v_max_cycle * n2v_vmax
-nmins = nmindrive.mdl_2_n_min_drives(*mdl)
+nmins = nmindrive.mdl_2_n_min_drives(**mdl)
 
 # %%
 cb.add_wots(gwots)
@@ -144,7 +144,7 @@
 cb.cycle["p_req"] = vehicle.calc_required_power(
     cb.cycle["p_inert"], cb.cycle["p_resist"]
 )
-p_remain = cycler.calc_p_remain(cb.cycle, cb.gidx)
+p_remain = cycler.calc_p_remain(cb.cycle["p_req"], cb.cycle["p_avail"])
 
 
 # %%
@@ -169,17 +169,17 @@ def flag_aggregates(ok_flags):
 # %%
 ok_n = cb.combine_ok_n_gear_flags(ok_flags)
 ok_flags1 = pd.concat((ok_flags, ok_n), axis=1)
-ok_gears = cb.combine_ok_n_p_gear_flags(ok_flags1)
+ok_gears = cb.derrive_ok_gears(ok_flags1)
 ok_gears.sum()
 
 # %%
 ok_n = cb.combine_ok_n_gear_flags(ok_flags)
 ok_flags1 = pd.concat((ok_flags, ok_n), axis=1)
-ok_gears = cb.combine_ok_n_p_gear_flags(ok_flags1)
+ok_gears = cb.derrive_ok_gears(ok_flags1)
 ok_gears.sum()
 
 # %%
-g_min, g_max0 = cb.make_gmax0(ok_gears)
+g_min, g_max0, _ = cb.make_gmax0(ok_gears)
 cycle = pd.concat((cb.cycle, ok_flags1, ok_gears, g_min, g_max0), axis=1)
 
 # %%

Notebooks/Matlab/RunAllCasesByOctave-fully.ipynb

@@ -50,11 +50,13 @@
    "outputs": [],
    "source": [
     "from typing import Union, List, Callable, Any, Sequence as Seq\n",
+    "from datetime import datetime\n",
     "import io\n",
     "import itertools as itt\n",
     "import logging\n",
     "from pathlib import Path, PurePosixPath as P\n",
     "import sys\n",
+    "import os.path as osp\n",
     "\n",
     "from columnize import columnize\n",
     "import numpy as np\n",
@@ -65,11 +67,8 @@
     "from pandalone.mappings import Pstep\n",
     "import qgrid\n",
     "\n",
-    "from graphtik import operation, compose, optional, sideffect\n",
     "import wltp\n",
-    "from wltp.experiment import Experiment\n",
-    "from wltp.utils import yaml_loads, matlab_pwd_changed\n",
-    "from wltp import datamodel, io as wio, engine, vmax, vehicle, cycler\n",
+    "from wltp.utils import matlab_pwd_changed\n",
     "\n",
     "## Add tests/ into `sys.path` to import `vehdb` module.\n",
     "#\n",
@@ -96,9 +95,17 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "## Setup Octave to execute wltp's MATLAB sources.\n",
+    "#\n",
     "from oct2py import octave as oc\n",
     "\n",
-    "%load_ext oct2py.ipython"
+    "# See https://nbviewer.jupyter.org/github/blink1073/oct2py/blob/master/example/octavemagic_extension.ipynb?create=1\n",
+    "%load_ext oct2py.ipython\n",
+    "\n",
+    "wltp_mat_sources_path = str(Path(\"src\").absolute())\n",
+    "mat_path = set(oc.path().split(osp.pathsep))\n",
+    "if wltp_mat_sources_path not in mat_path:\n",
+    "    oc.addpath(wltp_mat_sources_path)"
    ]
   },
   {
@@ -112,40 +119,19 @@
      "text": [
       "read input files :\n",
       "- case.txt\n",
+      "warning: fopen: '/home/ankostis/Work/wltp.git/Notebooks/Matlab/src/case.txt' found by searching load path\n",
       "- vehicle.txt\n",
+      "warning: fopen: '/home/ankostis/Work/wltp.git/Notebooks/Matlab/src/vehicle.txt' found by searching load path\n",
       "- engine.txt\n",
-      "  ...reading 1 out of 5095 in 34.7 sec\n",
-      "  ...reading 1719 out of 5095 in 41.7 sec\n",
-      "  ...reading 3428 out of 5095 in 48.7 sec\n",
+      "warning: fopen: '/home/ankostis/Work/wltp.git/Notebooks/Matlab/src/engine.txt' found by searching load path\n",
       "- gearbox.txt\n",
+      "warning: fopen: '/home/ankostis/Work/wltp.git/Notebooks/Matlab/src/gearbox.txt' found by searching load path\n",
       "- phase.txt\n",
+      "warning: fopen: '/home/ankostis/Work/wltp.git/Notebooks/Matlab/src/phase.txt' found by searching load path\n",
       "- trace.txt\n",
-      "  ...reading 1 out of 7015 in 50.2 sec\n",
-      "  ...reading 180 out of 7015 in 57.2 sec\n",
-      "  ...reading 349 out of 7015 in 64.2 sec\n",
-      "  ...reading 517 out of 7015 in 71.2 sec\n",
-      "  ...reading 681 out of 7015 in 78.2 sec\n",
-      "  ...reading 842 out of 7015 in 85.3 sec\n",
-      "  ...reading 1000 out of 7015 in 92.3 sec\n",
-      "  ...reading 1153 out of 7015 in 99.3 sec\n",
-      "  ...reading 1304 out of 7015 in 106.3 sec\n",
-      "  ...reading 1456 out of 7015 in 113.3 sec\n",
-      "  ...reading 1605 out of 7015 in 120.3 sec\n",
-      "  ...reading 1753 out of 7015 in 127.4 sec\n",
-      "  ...reading 1906 out of 7015 in 134.4 sec\n",
-      "  ...reading 2057 out of 7015 in 141.4 sec\n",
-      "  ...reading 2208 out of 7015 in 148.4 sec\n",
-      "  ...reading 2360 out of 7015 in 155.4 sec\n",
-      "  ...reading 2506 out of 7015 in 162.5 sec\n",
-      "  ...reading 2658 out of 7015 in 169.5 sec\n",
-      "  ...reading 2809 out of 7015 in 176.5 sec\n",
-      "  ...reading 2959 out of 7015 in 183.6 sec\n",
-      "  ...reading 3109 out of 7015 in 190.6 sec\n",
-      "  ...reading 3257 out of 7015 in 197.6 sec\n",
-      "  ...reading 3406 out of 7015 in 204.6 sec\n",
-      "  ...reading 5002 out of 7015 in 211.6 sec\n",
-      "  ...reading 6752 out of 7015 in 218.6 sec\n",
+      "warning: fopen: '/home/ankostis/Work/wltp.git/Notebooks/Matlab/src/trace.txt' found by searching load path\n",
       "- scale.txt\n",
+      "warning: fopen: '/home/ankostis/Work/wltp.git/Notebooks/Matlab/src/scale.txt' found by searching load path\n",
       "write formatted input files :\n",
       "- case_formatted.txt\n",
       "- vehicle_formatted.txt\n",
@@ -1653,14 +1639,46 @@
       "  - phase_result.txt\n",
       "  - shift_power.txt\n",
       "  - shift.txt\n",
-      "  - shift_condensed.txt\n",
-      "CPU times: user 1.49 s, sys: 234 ms, total: 1.72 s\n",
-      "Wall time: 32min 35s\n"
+      "  - shift_condensed.txt\n"
+     ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "'\\nStart-time: 2020-10-14 14:37:36.493495, end-time: 2020-10-14 15:10:57.499431'"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "ename": "Oct2PyError",
+     "evalue": "Octave evaluation error:\nerror: element number 1 undefined in return list",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[0;31mOct2PyError\u001b[0m                               Traceback (most recent call last)",
+      "\u001b[0;32m<timed eval>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n",
+      "\u001b[0;32m<ipython-input-5-47f95c52a1b7>\u001b[0m in \u001b[0;36mrun_mat\u001b[0;34m()\u001b[0m\n\u001b[1;32m      3\u001b[0m     \u001b[0;32mtry\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      4\u001b[0m         \u001b[0;32mwith\u001b[0m \u001b[0mmatlab_pwd_changed\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"outs\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0moc\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 5\u001b[0;31m             \u001b[0moc\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcalc_all_cases\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      6\u001b[0m     \u001b[0;32mfinally\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      7\u001b[0m         \u001b[0mend_time\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mdatetime\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mnow\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
+      "\u001b[0;32m~/Work/wltp.git/.venv/lib/python3.8/site-packages/oct2py/dynamic.py\u001b[0m in \u001b[0;36m__call__\u001b[0;34m(self, *inputs, **kwargs)\u001b[0m\n\u001b[1;32m     94\u001b[0m                         for item in pair)\n\u001b[1;32m     95\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 96\u001b[0;31m         \u001b[0;32mreturn\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0m_ref\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mfeval\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mname\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0minputs\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m**\u001b[0m\u001b[0mkwargs\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     97\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     98\u001b[0m     \u001b[0;32mdef\u001b[0m \u001b[0m__repr__\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
+      "\u001b[0;32m~/Work/wltp.git/.venv/lib/python3.8/site-packages/oct2py/core.py\u001b[0m in \u001b[0;36mfeval\u001b[0;34m(self, func_path, *func_args, **kwargs)\u001b[0m\n\u001b[1;32m    378\u001b[0m             \u001b[0mstream_handler\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mlogger\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0minfo\u001b[0m \u001b[0;32mif\u001b[0m \u001b[0mverbose\u001b[0m \u001b[0;32melse\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mlogger\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mdebug\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    379\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 380\u001b[0;31m         return self._feval(func_name, func_args, dname=dname, nout=nout,\n\u001b[0m\u001b[1;32m    381\u001b[0m                           \u001b[0mtimeout\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mtimeout\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mstream_handler\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mstream_handler\u001b[0m\u001b[0;34m,\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    382\u001b[0m                           store_as=store_as, plot_dir=plot_dir)\n",
+      "\u001b[0;32m~/Work/wltp.git/.venv/lib/python3.8/site-packages/oct2py/core.py\u001b[0m in \u001b[0;36m_feval\u001b[0;34m(self, func_name, func_args, dname, nout, timeout, stream_handler, store_as, plot_dir)\u001b[0m\n\u001b[1;32m    580\u001b[0m         \u001b[0;32mif\u001b[0m \u001b[0mresp\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m'err'\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    581\u001b[0m             \u001b[0mmsg\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0m_parse_error\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mresp\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m'err'\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 582\u001b[0;31m             \u001b[0;32mraise\u001b[0m \u001b[0mOct2PyError\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mmsg\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m    583\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    584\u001b[0m         \u001b[0mresult\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mresp\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m'result'\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mravel\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mtolist\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
+      "\u001b[0;31mOct2PyError\u001b[0m: Octave evaluation error:\nerror: element number 1 undefined in return list"
      ]
     }
    ],
    "source": [
-    "%time with matlab_pwd_changed(\"out\", oc): oc.calc_all_cases()"
+    "def run_mat():\n",
+    "    start_time = datetime.now()\n",
+    "    try:\n",
+    "        with matlab_pwd_changed(\"outs\", oc):\n",
+    "            oc.calc_all_cases()\n",
+    "    finally:\n",
+    "        end_time = datetime.now()\n",
+    "        display(f\"\\nStart-time: {start_time}, end-time: {end_time}\")\n",
+    "\n",
+    "\n",
+    "%time run_mat()"
    ]
   }
  ],
@@ -1683,7 +1701,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.2"
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,