Skip to content

Commit

Permalink
merge master into v0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Jinyu Wang committed Dec 27, 2022
2 parents 135d2fc + 38eb389 commit a783b57
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 11 deletions.
2 changes: 1 addition & 1 deletion maro/__misc__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# Licensed under the MIT license.


__version__ = "0.2.4a1"
__version__ = "0.3.0a1"

__data_version__ = "0.2"
2 changes: 1 addition & 1 deletion maro/cli/inspector/citi_bike_dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def render_inter_view(source_path: str, epoch_num: int):
# Get epoch sample number.
down_pooling_range = helper._get_sampled_epoch_range(epoch_num, sample_ratio)
attribute_option_candidates = (
CITIBIKEItemOption.quick_info + CITIBIKEItemOption.requirement_info + CITIBIKEItemOption.station_info
CITIBIKEItemOption.quick_info + CITIBIKEItemOption.requirement_info + ["bikes", "capacity"]
)
# Generate data.
data_summary = helper.read_detail_csv(
Expand Down
17 changes: 9 additions & 8 deletions maro/cli/inspector/dashboard_helper.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT license.

import copy
import math
from typing import List

Expand Down Expand Up @@ -206,10 +207,10 @@ def _get_attribute_option(
if scenario == GlobalScenarios.CITI_BIKE:
for item in attribute_option:
if item == "All":
attribute_option_candidates.remove("All")
attribute_option_candidates.remove("Requirement Info")
attribute_option_candidates.remove("Station Info")
attribute_option_res = attribute_option_candidates
attribute_option_res = copy.deepcopy(attribute_option_candidates)
attribute_option_res.remove("All")
attribute_option_res.remove("Requirement Info")
attribute_option_res.remove("Station Info")
break
elif item == "Requirement Info":
attribute_option_res = attribute_option_res + CITIBIKEItemOption.requirement_info
Expand All @@ -222,10 +223,10 @@ def _get_attribute_option(
if scenario == GlobalScenarios.CIM:
for item in attribute_option:
if item == "All":
attribute_option_candidates.remove("All")
attribute_option_candidates.remove("Booking Info")
attribute_option_candidates.remove("Port Info")
attribute_option_res = attribute_option_candidates
attribute_option_res = copy.deepcopy(attribute_option_candidates)
attribute_option_res.remove("All")
attribute_option_res.remove("Booking Info")
attribute_option_res.remove("Port Info")
break
elif item == "Booking Info":
attribute_option_res = attribute_option_res + CIMItemOption.booking_info
Expand Down
2 changes: 1 addition & 1 deletion maro/cli/inspector/requirements.inspector.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
altair==4.1.0
streamlit==0.69.1
streamlit==1.11.1
tqdm==4.51.0
23 changes: 23 additions & 0 deletions requirements.dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,53 @@ azure-mgmt-containerservice
azure-mgmt-resource
azure-mgmt-storage
azure-storage-file-share
black==22.3.0
certifi==2022.12.7
cryptography>=36.0.1
Cython==0.29.14
deepdiff>=5.7.0
docker
editorconfig-checker==2.4.0
flake8==4.0.1
Flask>=1.1.2
Flask_Cors>=3.0.10
Flask_SocketIO>=5.2.0
flloat==0.3.0
geopy>=2.0.0
holidays>=0.10.3
Jinja2>=2.11.3
kubernetes>=21.7.0
markupsafe==2.0.1
matplotlib==3.5.2
networkx==2.4
numpy>=1.19.5
palettable==3.3.0
pandas>=0.25.3
paramiko>=2.9.2
pre-commit==2.19.0
prompt_toolkit>=2.0.10
psutil>=5.8.0
ptvsd>=4.3.2
pulp==2.6.0
PyJWT>=2.4.0
python_dateutil>=2.8.1
PyYAML>=5.4.1
pyzmq>=19.0.2
recommonmark~=0.6.0
requests>=2.25.1
scipy>=1.7.0
setuptools==58.0.4
six==1.13.0
sphinx==1.8.6
sphinx_rtd_theme==1.0.0
streamlit>=0.69.1
stringcase>=1.2.0
tabulate>=0.8.5
termgraph==0.5.3
torch==1.6.0
torchsummary==1.5.1
tornado>=6.1
tqdm>=4.51.0
urllib3==1.26.5
wrapt==1.11.2
zmq==0.0.0

0 comments on commit a783b57

Please sign in to comment.