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

For multiple year run periods, only show final simulation year in tabular reports #5256

Merged
merged 10 commits into from Oct 22, 2015

Conversation

Projects
None yet
4 participants
@JasonGlazer
Copy link
Contributor

commented Oct 9, 2015

Fixing #4284.

@nrel-bot

This comment has been minimized.

Copy link

commented on 720b03b Oct 5, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-MacOS-10.9-clang: OK (1890 of 1890 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 5, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1896 of 1896 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 5, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

This comment has been minimized.

Copy link

replied Oct 5, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (822 of 822 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 6, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - i386-Windows-7-VisualStudio-12: OK (1896 of 1896 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 6, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1360 of 1360 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 6, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - Win64-Windows-7-VisualStudio-12: Build Failed

Build Badge Test Badge

@nrel-bot

This comment has been minimized.

Copy link

commented on ea3aa1b Oct 9, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-MacOS-10.9-clang: Build Failed

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 9, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: Build Failed

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 9, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

This comment has been minimized.

Copy link

replied Oct 9, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - i386-Windows-7-VisualStudio-12: OK (1896 of 1896 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 9, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: Build Failed

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 9, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: Build Failed

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 9, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - Win64-Windows-7-VisualStudio-12: OK (1896 of 1896 tests passed)

Build Badge Test Badge

Changed how the Energy Meters tabular report was accumulating and add…
…ed new members to the MeterType data structure to support it.
@JasonGlazer

This comment has been minimized.

Copy link
Contributor Author

commented Oct 12, 2015

This should be all the code changes needed. No test cases developed yet.

@nrel-bot

This comment has been minimized.

Copy link

commented on b8c57e5 Oct 12, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-MacOS-10.9-clang: Build Failed

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 12, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: Build Failed

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 12, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

This comment has been minimized.

Copy link

replied Oct 12, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: Build Failed

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 12, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: Build Failed

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 12, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - i386-Windows-7-VisualStudio-12: Tests Failed

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 12, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - Win64-Windows-7-VisualStudio-12: Tests Failed

Build Badge Test Badge

@nrel-bot

This comment has been minimized.

Copy link

commented on 94c0b44 Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-MacOS-10.9-clang: Tests Failed

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: Tests Failed

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - i386-Windows-7-VisualStudio-12: Tests Failed

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (822 of 822 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - Win64-Windows-7-VisualStudio-12: Tests Failed

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1360 of 1360 tests passed)

Build Badge Test Badge Coverage Badge

@nrel-bot

This comment has been minimized.

Copy link

commented on bcd4ca3 Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-MacOS-10.9-clang: OK (1903 of 1903 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1909 of 1909 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - i386-Windows-7-VisualStudio-12: OK (1909 of 1909 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (835 of 835 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - Win64-Windows-7-VisualStudio-12: OK (1909 of 1909 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1373 of 1373 tests passed)

Build Badge Test Badge Coverage Badge

@nrel-bot

This comment has been minimized.

Copy link

commented on 402f619 Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-MacOS-10.9-clang: OK (1905 of 1905 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - i386-Windows-7-VisualStudio-12: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - Win64-Windows-7-VisualStudio-12: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (837 of 837 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 14, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1375 of 1375 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link
Contributor Author

replied Oct 14, 2015

@Myoldmopar @mjwitte The build is clean except one warning on the MacOS clang build:

third_party/gtest/include/gtest/gtest.h:1448:16
comparison of integers of different signs: 'const int' and 'const unsigned int' [-Wsign-compare]

I am not sure what this is referencing since it is a line in gtest.h and not in any lines of code that I added. I tried increasing the warning level in Visual Studio but I can't find anything similar. I don't see a similar warning in other recent pull requests so I assume it is related to my code changes. Any suggestions on what to do at this point?

Who on the team works on a Mac using Clang?

@nrel-bot

This comment has been minimized.

Copy link

commented on 402f619 Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-MacOS-10.9-clang: OK (1905 of 1905 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - i386-Windows-7-VisualStudio-12: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - Win64-Windows-7-VisualStudio-12: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

This comment has been minimized.

Copy link

replied Oct 13, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (837 of 837 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 14, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1375 of 1375 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link
Contributor Author

replied Oct 14, 2015

@Myoldmopar @mjwitte The build is clean except one warning on the MacOS clang build:

third_party/gtest/include/gtest/gtest.h:1448:16
comparison of integers of different signs: 'const int' and 'const unsigned int' [-Wsign-compare]

I am not sure what this is referencing since it is a line in gtest.h and not in any lines of code that I added. I tried increasing the warning level in Visual Studio but I can't find anything similar. I don't see a similar warning in other recent pull requests so I assume it is related to my code changes. Any suggestions on what to do at this point?

Who on the team works on a Mac using Clang?

@nrel-bot

This comment has been minimized.

Copy link

commented on f116c73 Oct 14, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-MacOS-10.9-clang: OK (1905 of 1905 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 14, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 14, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

This comment has been minimized.

Copy link

replied Oct 14, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (837 of 837 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 14, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - i386-Windows-7-VisualStudio-12: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 19, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - Win64-Windows-7-VisualStudio-12: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 20, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1911 of 1911 tests passed)

Build Badge Test Badge

This comment has been minimized.

Copy link

replied Oct 20, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

This comment has been minimized.

Copy link

replied Oct 20, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (837 of 837 tests passed)

Build Badge Test Badge Coverage Badge

This comment has been minimized.

Copy link

replied Oct 20, 2015

93653630-MultipleYearRunPeriodForTabularReports (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1375 of 1375 tests passed)

Build Badge Test Badge Coverage Badge

@mjwitte

This comment has been minimized.

Copy link
Contributor

commented on tst/EnergyPlus/unit/OutputReportTabular.unit.cc in 402f619 Oct 14, 2015

Just guessing, but it sounds like the warning is from an EXPECT_EQ with integers, like this line?

@JasonGlazer

This comment has been minimized.

Copy link
Contributor Author

commented Oct 14, 2015

Yes, that is what it turned out to be. It is passing Clang now.

@JasonGlazer

This comment has been minimized.

Copy link
Contributor Author

commented Oct 14, 2015

I think this finally ready to be reviewed and merged. I assume either @Myoldmopar or @mjwitte are willing to review, if not let me know.

@mjwitte

This comment has been minimized.

Copy link
Contributor

commented Oct 14, 2015

I will leave this for @Myoldmopar to review.
@JasonGlazer Please edit the pull request title and description to be appropriate for the change log.

@JasonGlazer JasonGlazer changed the title 93653630 multiple year run period for tabular reports Tabular reports show only last year in multiple year run period. Oct 16, 2015

@Myoldmopar Myoldmopar self-assigned this Oct 21, 2015

@Myoldmopar Myoldmopar added this to the EnergyPlus 8.5.0 milestone Oct 21, 2015

@Myoldmopar

This comment has been minimized.

Copy link
Member

commented Oct 22, 2015

@JasonGlazer, this looks good. Built and ran locally. Took an example file and ran 3 years with develop and this branch, and as expected, the tabular output is only showing the last year in this branch. Merging and closing the bug. Thanks.

Myoldmopar added a commit that referenced this pull request Oct 22, 2015

Merge pull request #5256 from NREL/93653630-MultipleYearRunPeriodForT…
…abularReports

Tabular reports show only last year in multiple year run period.

@Myoldmopar Myoldmopar merged commit b71a9f7 into develop Oct 22, 2015

6 of 7 checks passed

x86_64-MacOS-10.9-clang Tests Failed
Details
Win64-Windows-7-VisualStudio-12 OK (1911 of 1911 tests passed)
Details
i386-Windows-7-VisualStudio-12 OK (1911 of 1911 tests passed)
Details
x86_64-Linux-Ubuntu-14.04-cppcheck-1.61 OK (0 of 0 tests passed)
Details
x86_64-Linux-Ubuntu-14.04-gcc-4.8 OK (1911 of 1911 tests passed)
Details
x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug OK (1375 of 1375 tests passed)
Details
x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug OK (837 of 837 tests passed)
Details

@Myoldmopar Myoldmopar deleted the 93653630-MultipleYearRunPeriodForTabularReports branch Jan 4, 2016

@JasonGlazer JasonGlazer restored the 93653630-MultipleYearRunPeriodForTabularReports branch Jan 29, 2016

@JasonGlazer JasonGlazer deleted the 93653630-MultipleYearRunPeriodForTabularReports branch Jan 29, 2016

@Myoldmopar Myoldmopar changed the title Tabular reports show only last year in multiple year run period. Only show final simulation year in tabular reports multiple year run periods Feb 16, 2016

@Myoldmopar Myoldmopar changed the title Only show final simulation year in tabular reports multiple year run periods For multiple year run periods, only show final simulation year in tabular reports Mar 25, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.