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.

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

Fix returned array shape for accumulator #3578

Merged
merged 1 commit into from
Mar 12, 2020

Conversation

KaiSzuttor
Copy link
Member

@KaiSzuttor KaiSzuttor commented Mar 12, 2020

Fixes part of #3577

Description of changes:

  • Test for correct shape
  • Return correct shape from observable accumulators

@KaiSzuttor KaiSzuttor requested a review from jngrad March 12, 2020 08:51
jngrad
jngrad previously approved these changes Mar 12, 2020
Copy link
Member

@jngrad jngrad left a comment

Choose a reason for hiding this comment

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

LGTM, pending the inheritance fix

testsuite/python/accumulator.py Outdated Show resolved Hide resolved
@KaiSzuttor
Copy link
Member Author

just talked to @fweik. He prefers to implement a core function that returns the shape. I will have a look.

@fweik
Copy link
Contributor

fweik commented Mar 12, 2020

I don't think this should be done on the python level. Determining the shape require knowledge of the core implementation, and should therefor be done there.

@fweik fweik dismissed jngrad’s stale review March 12, 2020 10:59

I disagree.

@KaiSzuttor KaiSzuttor force-pushed the accumulators branch 4 times, most recently from 772a6e6 to c76f023 Compare March 12, 2020 13:28
@codecov
Copy link

codecov bot commented Mar 12, 2020

Codecov Report

Merging #3578 into python will decrease coverage by <1%.
The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff           @@
##           python   #3578   +/-   ##
======================================
- Coverage      88%     88%   -1%     
======================================
  Files         524     524           
  Lines       23599   23611   +12     
======================================
+ Hits        20777   20784    +7     
- Misses       2822    2827    +5
Impacted Files Coverage Δ
src/core/accumulators/TimeSeries.hpp 100% <100%> (ø) ⬆️
..._interface/accumulators/MeanVarianceCalculator.hpp 91% <100%> (ø) ⬆️
src/script_interface/accumulators/TimeSeries.hpp 65% <100%> (+3%) ⬆️
src/core/accumulators/MeanVarianceCalculator.hpp 100% <100%> (ø) ⬆️
src/core/polymer.cpp 93% <0%> (-6%) ⬇️
src/core/particle_data.cpp 96% <0%> (-1%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a8e71b2...65b23dc. Read the comment docs.

@fweik fweik added the automerge Merge with kodiak label Mar 12, 2020
@kodiakhq kodiakhq bot merged commit 784d343 into espressomd:python Mar 12, 2020
@KaiSzuttor KaiSzuttor deleted the accumulators branch March 12, 2020 14:49
@jngrad jngrad added this to the Espresso 4.2 milestone Mar 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants