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

Fix issues with MeasureManager #720

Merged
merged 41 commits into from
Aug 2, 2024
Merged

Fix issues with MeasureManager #720

merged 41 commits into from
Aug 2, 2024
+2,076 −14,496

Commits on Apr 14, 2024

  1. Merge pull request #710 from openstudiocoalition/develop 

    Remove pre-release tag for 1.7.1
    @macumber
    macumber authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    fd8611d View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Add loading tab to discourage selecting another measure which argumen… 

    …ts for first measure are being computed (this can take a long time in failure case). Catch all std::exceptions instead of just RubyExceptions which prevents crash. Fixes #656
    @macumber
    macumber committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    64121ee View commit details
    Browse the repository at this point in the history

  2. Fix clang format

    @macumber
    macumber committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    7ed4df8 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Merge remote-tracking branch 'remotes/origin/develop' into measure_fixes

    @macumber
    macumber committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    7fc6f69 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Update openstudio_results to version compatible with OS CLI 3.8.0

    @macumber
    macumber committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    57d0a60 View commit details
    Browse the repository at this point in the history

  2. Add Example->Shoebox Model 

    Don't use classic mode for measure manager

Don't auto update openstudio_results from BCL
    @macumber
    macumber committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    2ddc96e View commit details
    Browse the repository at this point in the history

  3. Add model and measures for shoebox example

    @macumber
    macumber committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    d242c14 View commit details
    Browse the repository at this point in the history

  4. Catch exceptions if measures in upgraded model have measures that no … 

    …longer work
    @macumber
    macumber committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    05f8f2c View commit details
    Browse the repository at this point in the history

  5. Clang format

    @macumber
    macumber committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    3eac9db View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Do not automatically update the results measure from BCL

    @macumber
    macumber committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    cd2ac09 View commit details
    Browse the repository at this point in the history

  2. Measure in local bcl might not work either

    @macumber
    macumber committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    b10bf89 View commit details
    Browse the repository at this point in the history

  3. Update sha for OS 3.8.0 tag

    @macumber
    macumber committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    ee7d527 View commit details
    Browse the repository at this point in the history

  4. Correct sha for 3.7.0 release

    @macumber
    macumber committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    94f2cf1 View commit details
    Browse the repository at this point in the history

  5. Bump after changing merge base to master

    @macumber
    macumber committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    d198bcf View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Update to SHA of assets for 3.7.0

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    b12bd77 View commit details
    Browse the repository at this point in the history

  2. Download latest (unreleased) conan.cmake file, try boost 1.84 on ARM … 

    …Mac with updated xcode
    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    23b0ca3 View commit details
    Browse the repository at this point in the history

  3. Temporarily limit to mac arm

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    255f4cb View commit details
    Browse the repository at this point in the history

  4. Try latest version of boost 1.79 recipe

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    c1df727 View commit details
    Browse the repository at this point in the history

  5. Also comment out these matrix items

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    d677d83 View commit details
    Browse the repository at this point in the history

  6. Looks like the only option is to fork the boost recipe and delete thi… 

    …s line https://github.com/boostorg/unordered/blob/boost-1.79.0/include/boost/unordered/detail/fwd.hpp#L53
    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    e6c8beb View commit details
    Browse the repository at this point in the history

  7. Set XCode SDK version

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    f11f20b View commit details
    Browse the repository at this point in the history

  8. Test changes on all runners

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    a6efa4f View commit details
    Browse the repository at this point in the history

  9. Update measures from BCL

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    243ea30 View commit details
    Browse the repository at this point in the history

  10. Remove unused/duplicate method downloadUpdatedBCLMeasures

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    6ae468f View commit details
    Browse the repository at this point in the history

  11. Move standardReportMeasure to MeasureManager, test updates to measure… 

    …s by version id and timestamp
    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    65d6505 View commit details
    Browse the repository at this point in the history

  12. Clang format

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    223964d View commit details
    Browse the repository at this point in the history

  13. Remove unused m_useClassicCLI, cannot use classic CLI for MeasureMana… 

    …ger any more
    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    65af11b View commit details
    Browse the repository at this point in the history

  14. Merge remote-tracking branch 'origin/v1.7.2-patch' into measure_fixes 

    # Conflicts:
#	ConanInstall.cmake
#	src/openstudio_lib/OSDocument.cpp
    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    5f8d3b9 View commit details
    Browse the repository at this point in the history

  15. Update translations

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    ddc371f View commit details
    Browse the repository at this point in the history

  16. Remove measure from disk when deleting last step using it

    @macumber
    macumber committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    df63e23 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge pull request #723 from openstudiocoalition/v1.7.2-patch 

    v1.7.2 patch to not automatically download results measure
    @jmarrec
    jmarrec authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    10eb8f7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'remotes/origin/master' into measure_fixes

    @macumber
    macumber committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    c670790 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. Remove workarounds now that NREL/OpenStudio#5129 is merged

    @macumber
    macumber committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    0feb782 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Remove Shoebox Model from repo, fetch at configure time

    @macumber
    macumber committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    f83e1cb View commit details
    Browse the repository at this point in the history

  2. Remove openstudio_results measure from repo, install from the openstu… 

    …dio-coalition-measures
    @macumber
    macumber committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    49e8cc2 View commit details
    Browse the repository at this point in the history

  3. Find openstudio_results and ShoeboxModel when running in build dir

    @macumber
    macumber committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    06a3a6b View commit details
    Browse the repository at this point in the history

  4. Add measure type badges to workflow steps

    @macumber
    macumber committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    53cfba1 View commit details
    Browse the repository at this point in the history

  5. Measure manager changed argument to update_measures from measure_dir … 

    …to measures_dir. Use both for now in case that changes.
    @macumber
    macumber committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    ba11995 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/develop' into measure_fixes 

    # Conflicts:
#	translations/OpenStudioApp_ar.ts
#	translations/OpenStudioApp_ca.ts
#	translations/OpenStudioApp_de.ts
#	translations/OpenStudioApp_el.ts
#	translations/OpenStudioApp_es.ts
#	translations/OpenStudioApp_fa.ts
#	translations/OpenStudioApp_fr.ts
#	translations/OpenStudioApp_he.ts
#	translations/OpenStudioApp_hi.ts
#	translations/OpenStudioApp_it.ts
#	translations/OpenStudioApp_ja.ts
#	translations/OpenStudioApp_pl.ts
#	translations/OpenStudioApp_vi.ts
#	translations/OpenStudioApp_zh_CN.ts
    @macumber
    macumber committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    94e5e12 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/develop' into measure_fixes 

    # Conflicts:
#	src/openstudio_lib/OSDocument.cpp
    @macumber
    macumber committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    dcbdb87 View commit details
    Browse the repository at this point in the history

  8. Clang format

    @macumber
    macumber committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    da2d1ed View commit details
    Browse the repository at this point in the history