v2sim 1.4.2__tar.gz → 1.4.4__tar.gz

{v2sim-1.4.2 → v2sim-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v2sim
-Version: 1.4.2
+Version: 1.4.4
 Summary: V2Sim: An Open-Source V2G Simulation Platform in Urban Power and Transportation Network
 Project-URL: Homepage, https://github.com/hesl-seu/v2sim
 Project-URL: Documentation, https://hesl-seu.github.io/v2sim-wiki/

{v2sim-1.4.2 → v2sim-1.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "v2sim"
-version = "1.4.2"
+version = "1.4.4"
 dependencies = [ "feasytools>=0.1.4", "fpowerkit>=0.4.1", "networkx>=3.2.1", "numpy", "matplotlib", "pyproj", "requests", "cloudpickle", "sumolib", "dill", "libsumo", "scipy",]
 requires-python = ">= 3.9"
 license = "BSD-3-Clause"

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/__init__.py

@@ -6,4 +6,4 @@ from .net import *
 from .core import *
 from .wrapper import *
 
-__version__ = "1.4.2"
+__version__ = "1.4.4"

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/app/sim_single.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 import threading, sys, logging, platform
 from typing import Optional, Union
 from v2sim import Lang, get_sim_params
@@ -82,8 +83,46 @@ def main():
         print(Lang.MAIN_HELP_STR)
         return
     
+    # Version information
+    if args.pop_bool("version"):
+        import v2sim
+        print(v2sim.__version__)
+        return
+    
+    # Add/del plugins
+    add_plg = args.pop_str_or_none("add-plugin")
+    if add_plg:
+        if not add_plg.endswith(".py") or not Path(add_plg).is_file():
+            error_exit(Lang.ERROR_MAIN_PLUGIN_FILE.format(add_plg))
+        from v2sim.plugins import PluginHelper
+        if PluginHelper.add_plugin(add_plg, as_link=False):
+            print(Lang.MAIN_ADD_PLUGIN_SUCCESS.format(add_plg))
+        else:
+            print(Lang.MAIN_ADD_PLUGIN_FAIL.format(add_plg))
+        return
+    
+    add_plg_link = args.pop_str_or_none("add-plugin-link")
+    if add_plg_link:
+        if not add_plg_link.endswith(".py") or not Path(add_plg_link).is_file():
+            error_exit(Lang.ERROR_MAIN_PLUGIN_FILE.format(add_plg_link))
+        from v2sim.plugins import PluginHelper
+        if PluginHelper.add_plugin(add_plg_link, as_link=True):
+            print(Lang.MAIN_ADD_PLUGIN_SUCCESS.format(add_plg_link))
+        else:
+            print(Lang.MAIN_ADD_PLUGIN_FAIL.format(add_plg_link))
+        return
+    
+    del_plg_name = args.pop_str_or_none("del-plugin")
+    if del_plg_name:
+        from v2sim.plugins import PluginHelper
+        if PluginHelper.del_plugin(del_plg_name):
+            print(Lang.MAIN_DEL_PLUGIN_SUCCESS.format(del_plg_name))
+        else:
+            print(Lang.MAIN_DEL_PLUGIN_NOT_FOUND.format(del_plg_name))
+        return
+    
     # List available plugins and statistics
-    if args.pop_bool("ls-com"):
+    if args.pop_bool("ls-com") or args.pop_bool("list-plugins"):
         plg_pool, sta_pool = create_pools()
         print(Lang.MAIN_LS_TITLE_PLG)
         for key, (_, deps) in plg_pool.GetAllPlugins().items():

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/gen/misc.py

@@ -70,7 +70,34 @@ class VehicleTypePool:
             return self.sample_evtype()
         else:
             return self.sample_gvtype()
+    
+    def add_evtype(self, evtype:EVType, weight:float):
+        self.__evtypes.append(evtype)
+        self.__evt_weights.append(weight)
+        self.__total_ev_weight += weight
+    
+    def add_gvtype(self, gvtype:GVType, weight:float):
+        self.__gvtypes.append(gvtype)
+        self.__gvt_weights.append(weight)
+        self.__total_gv_weight += weight
 
+    def remove_evtype(self, evtype:EVType):
+        for i, et in enumerate(self.__evtypes):
+            if et == evtype:
+                self.__total_ev_weight -= self.__evt_weights[i]
+                del self.__evtypes[i]
+                del self.__evt_weights[i]
+                return
+        raise ValueError("EVType not found in pool")
+    
+    def remove_gvtype(self, gvtype:GVType):
+        for i, gt in enumerate(self.__gvtypes):
+            if gt == gvtype:
+                self.__total_gv_weight -= self.__gvt_weights[i]
+                del self.__gvtypes[i]
+                del self.__gvt_weights[i]
+                return
+        raise ValueError("GVType not found in pool")
     
 def random_diff(seq:Sequence[Any], exclude:Any):
     """Choose a random element from `seq` that is not equal to `exclude`"""

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/gui/mainbox/_lang/en_US.lang

@@ -3,7 +3,7 @@ BTN_FIND=Find
 MB_EXIT_SAVE=Save the project before exit?
 MB_SAVE_AND_SIM=Project not saved. Save the project and start simulation?
 STA_READY=Ready
-TITLE=V2Sim-UX Project Editor
+TITLE=V2Sim Project Editor
 LB_COUNT=Count: {0}
 MENU_PROJ=Project
 MENU_OPEN=Open...

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/gui/mainbox/_lang/zh_CN.lang

@@ -3,7 +3,7 @@ BTN_FIND=查找
 MB_EXIT_SAVE=是否要在退出前保存项目？
 MB_SAVE_AND_SIM=项目未保存。是否保存并开始仿真？
 STA_READY=就绪
-TITLE=V2Sim-UX项目编辑器
+TITLE=V2Sim项目编辑器
 LB_COUNT=数量：{0}
 MENU_PROJ=项目
 MENU_OPEN=打开...

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/gui/osmhelper/osmGet.py

@@ -151,7 +151,13 @@ def readCompressed(options, conn, urlpath, query, roadTypesJSON, getShapes, file
         with open(options.query_output, "w") as outf:
             outf.write(finalQuery)
 
-    conn.request("POST", "/" + urlpath, finalQuery, headers={'Accept-Encoding': 'gzip'})
+    request_path = urlpath if urlpath.startswith('/') else '/' + urlpath
+    headers = {
+        'Accept-Encoding': 'gzip',
+        'User-Agent': 'v2sim-osmWebWizard/1.0 (+https://github.com/hesl-seu/v2sim)',
+        'Accept': '*/*'
+    }
+    conn.request("POST", request_path, finalQuery.encode('utf-8'), headers=headers)
 
     response = conn.getresponse()
     if options.verbose:
@@ -171,6 +177,10 @@ def readCompressed(options, conn, urlpath, query, roadTypesJSON, getShapes, file
                 out.write(gzip.compress(lines))
             else:
                 out.write(lines)
+    else:
+        print("Error: Overpass API returned HTTP %s (%s)" % (response.status, response.reason), file=sys.stderr)
+        error_content = response.read().decode('utf-8', errors='replace')
+        print("Response: %s" % error_content, file=sys.stderr)
 
 
 def get_options(args):

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/gui/plgbox/__init__.py

@@ -1,8 +1,7 @@
 from v2sim.gui.common import *
 from collections import defaultdict
 from v2sim import load_external_components, PLUGINS_DIR, get_internal_components
-import os
-import shutil
+from v2sim.plugins import PluginHelper
 
 
 _ = LangLib.Load(__file__)
@@ -64,40 +63,15 @@ class PlgBox(Tk):
                 for v in val:
                     tree.insert(key_id, 'end', text=v)
             return confirm_have_exists
-
-        def get_lang_file(src_path: Union[str, Path]) -> Union[Path, None]:
-            src_parent = Path(src_path).parent
-            if (src_parent / "_lang").is_dir():
-                src_lang = src_parent / "_lang"
-            elif (src_parent / (Path(src_path).stem + ".langs")).is_file():
-                src_lang = src_parent / (Path(src_path).stem + ".langs")
-            else:
-                src_lang = None
-            return src_lang
         
         def on_import(link = False):
             src = filedialog.askopenfilename(title=_("IMPORT_PLUGIN_TITLE"), filetypes=[(_("Python files"), "*.py")])
             if not src: return
-            src_lang = get_lang_file(src)
-
-            dest_dir = PLUGINS_DIR
-            dest_dir.mkdir(parents=True, exist_ok=True)
-
-            dest_path_link = dest_dir / (Path(src).stem + ".link")
-            dest_path_py = dest_dir / (Path(src).stem + ".py")
             
             try:
-                if dest_path_link.exists():
-                    raise RuntimeError(_("ERROR_FILE_EXISTS").format(dest_path_link.name))
-                if dest_path_py.exists():
-                    raise RuntimeError(_("ERROR_FILE_EXISTS").format(dest_path_py.name))
-                if link:
-                    with open(dest_path_link, "w", encoding="utf-8") as f:
-                        f.write(src)
-                else:
-                    shutil.copy2(src, dest_path_py)
-                    if src_lang is not None:
-                        shutil.copy2(src_lang, dest_dir / src_lang.name)
+                success = PluginHelper.add_plugin(src, as_link=link)
+                if not success:
+                    raise RuntimeError(_("ERROR_FILE_EXISTS"))
                 plg_name = Path(src).stem
                 if refresh_tree(plg_name):
                     MB.showinfo(_("INFO"), _("IMPORT_SUCCESS").format(plg_name))
@@ -125,11 +99,8 @@ class PlgBox(Tk):
                 return
 
             file = PLUGINS_DIR / text  # keep extension
-            src_lang = get_lang_file(file)
             try:
-                os.remove(file)
-                if src_lang is not None:
-                    os.remove(src_lang)
+                PluginHelper.del_plugin(Path(file).stem)
                 MB.showinfo(_("INFO"), _("DELETE_SUCCESS"))
                 refresh_tree()
             except Exception as e:

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/gui/plgbox/_lang/en_US.lang

@@ -17,5 +17,5 @@ IMPORT_BUTTON=Import...
 IMPORT_LINK_BUTTON=Import link...
 DELETE_BUTTON=Remove
 IMPORT_BUT_NOT_LOADED=Plugin {0} has been imported, but it does not contain plugins or statistics.
-ERROR_FILE_EXISTS=File {0} already existed.
+ERROR_FILE_EXISTS=A plugin with the same name already existed.
 INTERNAL=(Internal)

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/gui/plgbox/_lang/zh_CN.lang

@@ -17,5 +17,5 @@ IMPORT_BUTTON=导入...
 IMPORT_LINK_BUTTON=导入链接...
 DELETE_BUTTON=移除
 IMPORT_BUT_NOT_LOADED=插件{0}已导入，但是它不包含有效的插件或统计项。
-ERROR_FILE_EXISTS=文件{0}已经存在。
+ERROR_FILE_EXISTS=已经存在同名插件。
 INTERNAL=(内部组件)

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/locale/lang.py

@@ -48,6 +48,7 @@ class Lang:
     ERROR_INVALID_CACHE_ROUTE = "Error: Invalid cache route: {0}"
     ERROR_INVALID_TRIP_GEN_MODE = "Error: Invalid trip generation mode: {0}"
     ERROR_CS_NODE_NOT_EXIST = "Error: CS node {0} does not exist in the road network."
+    ERROR_MAIN_PLUGIN_FILE = "Error: Plugin file '{}' is invalid."
 
     WARN_COPY_SKIPPED = "Warning: Copying case files skipped to avoid copying into itself."
     WARN_EXT_LOAD_FAILED = "Warning: {0} is a Python file, but cannot be loaded as a package: {1}"
@@ -86,6 +87,10 @@ class Lang:
     MAIN_SIGINT = "Received Ctrl-C signal, exiting prematurely."
     MAIN_SIM_DONE = "Simulation done. Duration: {}"
     MAIN_SIM_PROG = "Progress: {0:.2f}%, {1}/{2}. Elapsed: {3}, ETA: {4}"
+    MAIN_ADD_PLUGIN_SUCCESS = "Plugin '{}' has been imported successfully."
+    MAIN_ADD_PLUGIN_FAIL = "Failed to import plugin '{}'."
+    MAIN_DEL_PLUGIN_SUCCESS = "Plugin '{}' has been deleted successfully."
+    MAIN_DEL_PLUGIN_NOT_FOUND = "Plugin '{}' not found."
 
     PARA_SIM_SKIP_LIST = "Skip list: {}"
     PARA_SIM_DONE_PARA = "Parallel part done. Duration: {}"

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/locale/zh_CN.py

@@ -37,6 +37,7 @@ class _locale:
     ERROR_INVALID_CACHE_ROUTE = "错误: 无效的寻路缓存模式: {0}"
     ERROR_INVALID_TRIP_GEN_MODE = "错误: 无效的行程生成模式: {0}"
     ERROR_CS_NODE_NOT_EXIST = "错误: 充电站所在节点{0}不存在"
+    ERROR_MAIN_PLUGIN_FILE = "错误: 插件文件'{}'无效."
 
     WARN_EXT_LOAD_FAILED = "警告: {0}是Python文件, 但无法作为包加载: {1}"
     WARN_EXT_INVALID_PLUGIN = "警告: {0}的plugin_exports无效, 无法作为插件导入: {1}"
@@ -72,6 +73,10 @@ class _locale:
     MAIN_SIGINT = "收到Ctrl-C退出信号, 提前退出"
     MAIN_SIM_DONE = "仿真结束. 用时: {}"
     MAIN_SIM_PROG = "进度: {0:.2f}%, {1}/{2}. 已用时: {3}, 预计剩余时间: {4}"
+    MAIN_ADD_PLUGIN_SUCCESS = "插件'{}'已成功导入."
+    MAIN_ADD_PLUGIN_FAIL = "导入插件'{}'失败."
+    MAIN_DEL_PLUGIN_SUCCESS = "插件'{}'已成功删除."
+    MAIN_DEL_PLUGIN_NOT_FOUND = "未找到插件'{}'."
 
     PARA_SIM_SKIP_LIST = "跳过: {}"
     PARA_SIM_DONE_PARA = "并行部分完成. 用时: {}"

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/plugins/pool.py

@@ -1,5 +1,5 @@
 import dill as pickle
-from typing import Type
+from typing import Type, Union
 from ..utils import CheckPyVersion, PyVersion
 from .base import *
 from .pdn import PluginPDN
@@ -42,6 +42,71 @@ def RegPlugin(name:str, dependencies:Optional[List[str]] = None):
 class PluginError(Exception):
     pass
 
+
+class PluginHelper:
+    @staticmethod
+    def get_lang_file(src_path: Union[str, Path]) -> Union[Path, None]:
+        src_parent = Path(src_path).parent
+        if (src_parent / "_lang").is_dir():
+            src_lang = src_parent / "_lang"
+        elif (src_parent / (Path(src_path).stem + ".langs")).is_file():
+            src_lang = src_parent / (Path(src_path).stem + ".langs")
+        else:
+            src_lang = None
+        return src_lang
+    
+    @staticmethod
+    def has_plugin(name:str) -> bool:
+        from ..core import PLUGINS_DIR
+        dest_dir = PLUGINS_DIR
+        dest_path_link = dest_dir / (name + ".link")
+        dest_path_py = dest_dir / (name + ".py")
+        return dest_path_link.exists() or dest_path_py.exists()
+
+    @staticmethod
+    def add_plugin(file: Union[str, Path], as_link:bool = False) -> bool:
+        import shutil
+        from ..core import PLUGINS_DIR
+        dest_dir = PLUGINS_DIR
+        dest_dir.mkdir(parents=True, exist_ok=True)
+        file = Path(file).absolute()
+        name = file.stem
+        if PluginHelper.has_plugin(name):
+            return False
+        dest_path_link = dest_dir / (name + ".link")
+        dest_path_py = dest_dir / (name + ".py")
+        
+        if as_link:
+            with open(dest_path_link, "w", encoding="utf-8") as f:
+                f.write(str(file))
+        else:
+            src_lang = PluginHelper.get_lang_file(file)
+            shutil.copy2(file, dest_path_py)
+            if src_lang is not None:
+                shutil.copy2(src_lang, dest_dir / src_lang.name)
+        return True
+
+    @staticmethod
+    def del_plugin(name:str) -> bool:
+        from ..core import PLUGINS_DIR
+        dest_dir = PLUGINS_DIR
+        dest_path_link = dest_dir / (name + ".link")
+        dest_path_py = dest_dir / (name + ".py")
+        if dest_path_link.exists():
+            dest_path_link.unlink()
+            src_lang = PluginHelper.get_lang_file(dest_path_link)
+            if src_lang is not None:
+                src_lang.unlink()
+            return True
+        elif dest_path_py.exists():
+            dest_path_py.unlink()
+            src_lang = PluginHelper.get_lang_file(dest_path_py)
+            if src_lang is not None:
+                src_lang.unlink()
+            return True
+        else:
+            return False
+
 class PluginPool:
     '''Plugin pool'''
     def __init__(self, use_internal_plugins:bool = True):
@@ -216,4 +281,4 @@ class PluginMan:
         self._unsafe_load_states(d)
 
 
-__all__ = ['PluginPool', 'PluginMan', 'PluginError', 'RegPlugin', 'PluginExports', 'GetInternalPlugins']
+__all__ = ['PluginPool', 'PluginMan', 'PluginError', 'RegPlugin', 'PluginExports', 'GetInternalPlugins', 'PluginHelper']

{v2sim-1.4.2 → v2sim-1.4.4}/v2sim/veh/veh.py

@@ -115,6 +115,7 @@ class Vehicle:
         # Energy storage
         self._cap = cap                 # Energy capacity, kWh for EV, L for GV
         assert 0.0 <= pct <= 1.0
+        self._init_pct = pct            # Initial energy percentage (0.0~1.0)
         self._energy = pct * cap        # Current energy stored, kWh for EV, L for GV
         self._epm = epm                 # Energy consumption per unit distance, kWh/m for EV, L/m for GV
 
@@ -235,6 +236,11 @@ class Vehicle:
         self._cost = 0.0
         self._dis = 0.0
         self._trip_index = 0
+        self._energy = self._cap * self._init_pct
+        self._cs = None
+        self._etar = self._cap
+        self._fr_on_dpt = None
+        self._dpt_rs = None
     
     def drive(self, new_dis: float):
         """