bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

_helpers: generalise regular expression in find_opt

Browse Source
This commit is contained in:
Fabian Neumann 2024-02-17 23:38:59 +01:00
parent cf7018c8c4
commit df0eb38a68
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/_helpers.py
View File

@ -4,11 +4,11 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
import contextlib import contextlib
import copy
import hashlib import hashlib
import logging import logging
import os import os
import re import re
import copy
import urllib import urllib
from functools import partial from functools import partial
from pathlib import Path from pathlib import Path
@ -117,9 +117,9 @@ def find_opt(opts, expr):
""" """
for o in opts: for o in opts:
if expr in o: if expr in o:
m = re.findall("^m?\d*(\.|p)?\d+$", o) m = re.findall(r"m?\d+(?:[\.p]\d+)?", o)
if len(m) > 0: if len(m) > 0:
return True, float(m[0].replace("p", ".").replace("m", "-")) return True, float(m[-1].replace("p", ".").replace("m", "-"))
else: else:
return True, None return True, None
return False, None return False, None