Merge pull request #241 from pierreaubert/develop

Add global optimiser

Author: pierreaubert

.deepsource.toml

@@ -1,6 +1,6 @@
 version = 1
 
-test_patterns = ["test/**"]
+test_patterns = ["tests/*.py"]
 
 [[analyzers]]
 name = "python"
@@ -18,9 +18,20 @@ name = "javascript"
 enabled = true
 
   [analyzers.meta]
-  environment = ["jquery"]
-  style_guide = "google"
+  environment = ["browser"]
+  style_guide = "standard"
+  module_system = "es-modules"
+  dialect = "flow"
+
 
 [[analyzers]]
 name = "shell"
 enabled = true
+
+[[analyzers]]
+name = "secrets"
+enabled = true
+
+[[analyzers]]
+name = "cxx"
+enabled = true

.gitignore

@@ -13,6 +13,7 @@ TAGS
 *_large.png
 docs
 tmp
+extracted
 logs
 asrbook.aux
 asrbook.bbl
@@ -45,3 +46,5 @@ cache.*.h5
 .sass-cache
 build
 *.so
+bin
+coverage.xml

.pre-commit-config.yaml

@@ -24,3 +24,8 @@ repos:
     rev: v1.0.5
     hooks:
     -   id: csslint
+- repo: https://github.com/charliermarsh/ruff-pre-commit
+  # Ruff version.
+  rev: 'v0.0.263'
+  hooks:
+    - id: ruff

book/asrbook.tex

@@ -15,9 +15,6 @@
 \date{2020}
 \maketitle
 
-% \tableofcontents
-% \listoffigures
-
 \pagebreak
 
 \chapter{Introduction}

book/generate_book.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # A library to display spinorama charts
 #
-# Copyright (C) 2020-21 Pierre Aubert pierreaubert(at)yahoo(dot)fr
+# Copyright (C) 2020-2023 Pierre Aubert pierre(at)spinorama(dot)org
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,16 +36,12 @@
 
 if __name__ == "__main__":
     args = docopt(__doc__, version="generate_book.py version 0.1", options_first=True)
-
-    # logging.basicConfig(format='%(asctime)s,%(msecs)d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s',
-    #                    datefmt='%Y-%m-%d:%H:%M:%S')
     if args["--log-level"] is not None:
         level = args["--log-level"]
         if level in ["INFO", "DEBUG", "WARNING", "ERROR"]:
             logging.basicConfig(level=level)
-
-    # load all metadata from generated json file
     json_filename = "../docs/assets/metadata.json"
+
     if not os.path.exists(json_filename):
         logging.fatal("Cannot find %s", json_filename)
         sys.exit(1)
@@ -71,7 +67,7 @@ def sort_meta(s):
         speakers[speaker_name] = {"image": speaker_name, "title": speaker_title}
 
     # configure Mako
-    mako_templates = TemplateLookup(directories=["."], module_directory="/tmp/mako_modules")
+    mako_templates = TemplateLookup(directories=["."], module_directory="../build/mako_modules")
 
     # write index.html
     for template in ("asrbook",):

book/update_book.sh

@@ -1,8 +1,9 @@
+#!/bin/zsh
 mkdir -p ./tmp
 # copy files to tmp
-for i in ../docs/[A-Z]*/ASR/asr/2cols.jpg; do
-    j=${i#../docs/}
-    speaker1=${j%/ASR/asr/2cols.jpg}
+for i in ../docs/speakers/[A-Z]*/ASR/filters_eq.jpg; do
+    j=${i#../docs/speakers}
+    speaker1=${j%/ASR/filters_eq.jpg}
     speaker2=${speaker1// /-}
     speaker3=${speaker2//./-}
     cp "$i" ./tmp/$speaker3.jpg

check_404.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # A library to display spinorama charts
 #
-# Copyright (C) 2020-23 Pierre Aubert pierreaubert(at)yahoo(dot)fr
+# Copyright (C) 2020-2023 Pierre Aubert pierre(at)spinorama(dot)org
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-pylinkvalidate.py -P http://spinorama.internet-box.ch
+pylinkvalidate.py -P https://www.spinorama.org
 
 for f in docs/speakers/*/*/*/*.html; do
     name=${f#docs/}
     u=${name// /%20}
-    pylinkvalidate.py -P "http://spinorama.internet-box.ch/$u"
+    pylinkvalidate.py -P "https://www.spinorama.org/$u"
 done

check_html.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # A library to display spinorama charts
 #
-# Copyright (C) 2020-23 Pierre Aubert pierreaubert(at)yahoo(dot)fr
+# Copyright (C) 2020-2023 Pierre Aubert pierre(at)spinorama(dot)org
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

check_meta.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # A library to display spinorama charts
 #
-# Copyright (C) 2020-23 Pierre Aubert pierreaubert(at)yahoo(dot)fr
+# Copyright (C) 2020-2023 Pierre Aubert pierre(at)spinorama(dot)org
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -460,9 +460,9 @@ def sanity_check_specifications(name: str, version: str, specs: dict) -> int:
     "klippel",
     "princeton",
     "webplotdigitizer",
-    "rewstextdump",
-    "splHVtxt",
-    "gllHVtxt",
+    "rew_text_dump",
+    "spl_hv_txt",
+    "gll_hv_txt",
 )
 
 
@@ -481,35 +481,50 @@ def sanity_check_measurement(name: str, version: str, measurement: Measurement)
         if k not in MEASUREMENT_KNOWN_KEYS:
             logging.error("%s: version %s : %s is not known", name, version, k)
             status = 1
+            continue
         if k == "origin" and (
-            v not in ["ASR", "Misc", "ErinsAudioCorner", "Princeton"] and v[0:8] != "Vendors-"
+            isinstance(v, str)
+            and v not in ["ASR", "Misc", "ErinsAudioCorner", "Princeton"]
+            and v[0:8] != "Vendors-"
         ):
             logging.error("%s: origin %s is not known", name, v)
             status = 1
-        if k == "origin" and v[0:8] == "Vendors-" and not sanity_check_vendor(v):
+            continue
+        if (
+            k == "origin"
+            and isinstance(v, str)
+            and v[0:8] == "Vendors-"
+            and not sanity_check_vendor(v)
+        ):
             logging.error("%s: origin %s is known but vendor %s is not!", name, v, v[8:])
             status = 1
+            continue
         if k == "format" and v not in FORMAT_KNOWN_KEYS:
             logging.error("%s: format %s is not known", name, v)
             status = 1
+            continue
         if k == "symmetry" and v not in [
             "coaxial",
             "horizontal",
             "vertical",
         ]:
             logging.error("%s: symmetry %s is not known", name, v)
             status = 1
+            continue
         if k == "review" and not isinstance(v, str):
             logging.error("%s: review %s is not a string", name, v)
             status = 1
+            continue
         if k == "reviews":
             if not isinstance(v, dict):
                 logging.error("%s: review %s is not a dict", name, v)
                 status = 1
+                continue
             for _, i_v in v.items():
                 if not isinstance(i_v, str):
                     logging.error("%s: in reviews %s review %s is not a string", name, v, i_v)
                     status = 1
+            continue
         if k == "quality" and v not in ("unknown", "low", "medium", "high"):
             logging.error(
                 "%s: in measurement %s quality %s is unknown",
@@ -518,15 +533,21 @@ def sanity_check_measurement(name: str, version: str, measurement: Measurement)
                 v,
             )
             status = 1
+            continue
 
-        if k == "specifications" and sanity_check_specifications(name, version, v) != 0:
+        if (
+            k == "specifications"
+            and isinstance(v, dict)
+            and sanity_check_specifications(name, version, v) != 0
+        ):
             logging.error(
                 "%s: in measurement %s specifications %s is incorrect",
                 name,
                 version,
                 v,
             )
             status = 1
+            continue
 
     if version[0:3] == "mis" and "quality" not in measurement.keys():
         logging.error("%s: in measurement %s quality is required", name, version)

check_peqs.sh

@@ -1,6 +1,6 @@
 # A library to display spinorama charts
 #
-# Copyright (C) 2020-23 Pierre Aubert pierreaubert(at)yahoo(dot)fr
+# Copyright (C) 2020-2023 Pierre Aubert pierre(at)spinorama(dot)org
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by