Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing poor implementation of phase integration for AMI #163

Merged
merged 12 commits into from
Feb 3, 2024
Merged

Fixing poor implementation of phase integration for AMI #163

merged 12 commits into from
Feb 3, 2024

Conversation

aivanova5
Copy link
Contributor

Adjusting the players per phase;
Adjusting the player files to scale according to phase they're on.

@aivanova5
Update csv-ami2glm-player.py
8ba2f94 
Signed-off-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
@aivanova5 aivanova5 requested a review from dchassin February 1, 2024 01:30
@dchassin dchassin changed the base branch from master to develop February 1, 2024 13:56
dchassin
dchassin reviewed Feb 1, 2024
View reviewed changes
Copy link
Member

@dchassin dchassin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On line 117 is there any chance that "D" or "G" also show up and cause trouble? If so, maybe you can use re or ''.join([x for x in 'ABC' if x in val['phases']) to extract the phases.

David P. Chassin and others added 2 commits February 1, 2024 06:26
Merge branch 'develop' into develop-ami2glm-fix
4fb6223
@aivanova5
Update csv-ami2glm-player.py
3604663 
Signed-off-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
@aivanova5
Copy link
Contributor Author

@dchassin Fixed as suggested

@aivanova5
Add support for output column filter in json2csv-pandas (#166)
248df53 
Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu>
Signed-off-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
David P. Chassin and others added 8 commits February 2, 2024 14:26
Fixed re issues
4bd2fb6
@aivanova5
Update csv-ami2glm-player.py
d4ca58e 
Signed-off-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu>
Update version.h
175a2b8 
Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu>
@aivanova5
Update csv-ami2glm-player.py
93e673b 
Signed-off-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu>
@aivanova5
Add support for output column filter in json2csv-pandas (#166)
ced6a96 
Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu>
Signed-off-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu>
Fixed re issues
9398fa8 
Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu>
Merge branch 'develop-ami2glm-fix' of https://github.com/arras-energy…
2dd0fc2 
…/gridlabd into develop-ami2glm-fix
Update json2csv-pandas.py
f90953b 
Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu>
@aivanova5 aivanova5 merged commit 9b54ff0 into develop Feb 3, 2024
2 checks passed
@aivanova5 aivanova5 deleted the develop-ami2glm-fix branch February 3, 2024 00:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dchassin dchassin dchassin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Next patch update
Status: Closed
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aivanova5 @dchassin