Fix issues with MeasureManager #720

macumber · 2024-07-05T04:07:25Z

Remove pre-release tag for 1.7.1

…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

Don't use classic mode for measure manager Don't auto update openstudio_results from BCL

macumber · 2024-07-12T04:20:47Z

@jmarrec when updating a model with the old results measure, we probably need to swap the new one out, currently there is a crash due to this. The exception is caught in this branch now at least. However, there are going to be many measures that might need to be updated. So maybe it's best to not update the results measure, we can just show the errors and make users delete/replace measures themselves. This is going to be something we need to address in the release notes.

…longer work

src/openstudio_app/OpenStudioApp.hpp

…Mac with updated xcode

…s line https://github.com/boostorg/unordered/blob/boost-1.79.0/include/boost/unordered/detail/fwd.hpp#L53

…s by version id and timestamp

…ger any more

# Conflicts: # ConanInstall.cmake # src/openstudio_lib/OSDocument.cpp

macumber · 2024-07-14T19:22:44Z

@jmarrec if you have a chance to review this that would be good, the PR is not too big if you ignore src/openstudio_app/Resources/ which is just copies of measures from BCL

jmarrec · 2024-07-15T12:12:30Z

I'd probably have liked if the "Example > Shoebox Model" was isolated into its own PR.

v1.7.2 patch to not automatically download results measure

macumber · 2024-07-15T14:02:02Z

I'd probably have liked if the "Example > Shoebox Model" was isolated into its own PR.

Agreed, sorry I was in a rush, I can move it to a new PR if you'd like

FYI, I did merge openstudiocoalition/openstudio-coalition-measures#3 and release https://github.com/openstudiocoalition/openstudio-coalition-measures/releases/tag/v1.8.0 to support this

jmarrec · 2024-07-15T12:16:12Z

src/openstudio_app/OpenStudioApp.hpp

@@ -275,7 +276,6 @@ class OpenStudioApp : public OSAppBase
  QTranslator m_qtTranslator;
  QTranslator m_qtBaseTranslator;
  QString m_currLang;
-  bool m_useClassicCLI;


"Remove unused m_useClassicCLI, cannot use classic CLI for MeasureManager any more" (65af11b)

why?

This issue prevents using the classic CLI for the measure manager now: NREL/OpenStudio#5212

I figure it's probably not really worth supporting using classic for the measure manager in the future either, what do you think? You can still use the classic option for the run though.

jmarrec · 2024-07-15T12:17:46Z

.../Resources/ShoeboxModel/ShoeboxExample/measures/create_bar_from_space_type_ratios/LICENSE.md

I don't really like seeing these files here. Should we rely on the BCL to download these as needed?

I wanted to make these measures/example models part of the installer, so it is just ready to go with no download needed. We could fetch the measures/example models from https://github.com/openstudiocoalition/openstudio-coalition-measures at build time and keep them in the build directory rather than checking them in to this repo. They'd still be duplicates in the installer. Does that sound better?

I removed these measures from this repo, they are now pulled from https://github.com/openstudiocoalition/openstudio-coalition-measures at configure time

jmarrec · 2024-07-15T12:18:30Z

src/openstudio_app/Resources/ShoeboxModel/ShoeboxExample/measures/openstudio_results/LICENSE.md

Now we have two copies of the openstudio_results measure in source: in the Resources/ and Resources/ShoeboxExample/measures folders

I guess we could add the report measure to the ShoeboxExample model at run time. I had wanted to keep the model exactly the same as in https://github.com/openstudiocoalition/openstudio-coalition-measures/tree/main/models/ShoeboxExample, that way it would be simple to extend to other example models in the future.

I removed these measures from this repo, they are now pulled from https://github.com/openstudiocoalition/openstudio-coalition-measures at configure time

…dio-coalition-measures

…to measures_dir. Use both for now in case that changes.

# 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

# Conflicts: # src/openstudio_lib/OSDocument.cpp

macumber · 2024-07-26T15:57:48Z

Ping @jmarrec, do you want to give this a review? If not, I think we could merge and push out an RC1. What do you think?

jmarrec · 2024-07-31T14:23:05Z

Ping @jmarrec, do you want to give this a review? If not, I think we could merge and push out an RC1. What do you think?

An RC1 for 1.8.0? I'd like to see if we can get an updated CLI with NREL/OpenStudio#5230 fixed first

macumber · 2024-08-01T01:42:20Z

I don't think we need an updated 1.8.0 package. After I tested, the main issue was with the OpenStudio Results measure which gets downloaded and added to each model by default at startup. I fixed that in the 1.7.2 release. The other BCL menus have some filtering built into them, I think I have handled all the needed cases in this PR such that we don't have to have an update to OS SDK.

macumber added 2 commits April 14, 2024 17:07

Merge pull request #710 from openstudiocoalition/develop

fd8611d

Remove pre-release tag for 1.7.1

Add loading tab to discourage selecting another measure which argumen…

64121ee

…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 added this to the OpenStudio Application 1.8.0 milestone Jul 5, 2024

macumber added 5 commits July 4, 2024 22:25

Fix clang format

7ed4df8

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

7fc6f69

Update openstudio_results to version compatible with OS CLI 3.8.0

57d0a60

Add Example->Shoebox Model

2ddc96e

Don't use classic mode for measure manager Don't auto update openstudio_results from BCL

Add model and measures for shoebox example

d242c14

macumber added 2 commits July 11, 2024 23:17

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

05f8f2c

…longer work

Clang format

3eac9db

macumber commented Jul 12, 2024

View reviewed changes

src/openstudio_app/OpenStudioApp.hpp Outdated Show resolved Hide resolved

macumber added 18 commits July 13, 2024 10:47

Do not automatically update the results measure from BCL

cd2ac09

Measure in local bcl might not work either

b10bf89

Update sha for OS 3.8.0 tag

ee7d527

Correct sha for 3.7.0 release

94f2cf1

Bump after changing merge base to master

d198bcf

Update to SHA of assets for 3.7.0

b12bd77

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

23b0ca3

…Mac with updated xcode

Temporarily limit to mac arm

255f4cb

Try latest version of boost 1.79 recipe

c1df727

Also comment out these matrix items

d677d83

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

e6c8beb

…s line https://github.com/boostorg/unordered/blob/boost-1.79.0/include/boost/unordered/detail/fwd.hpp#L53

Set XCode SDK version

f11f20b

Test changes on all runners

a6efa4f

Update measures from BCL

243ea30

Remove unused/duplicate method downloadUpdatedBCLMeasures

6ae468f

Move standardReportMeasure to MeasureManager, test updates to measure…

65d6505

…s by version id and timestamp

Clang format

223964d

Remove unused m_useClassicCLI, cannot use classic CLI for MeasureMana…

65af11b

…ger any more

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

5f8d3b9

# Conflicts: # ConanInstall.cmake # src/openstudio_lib/OSDocument.cpp

macumber requested a review from jmarrec July 14, 2024 19:21

macumber added 2 commits July 14, 2024 14:13

Update translations

ddc371f

Remove measure from disk when deleting last step using it

df63e23

jmarrec and others added 2 commits July 15, 2024 15:28

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

10eb8f7

v1.7.2 patch to not automatically download results measure

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

c670790

jmarrec reviewed Jul 15, 2024

View reviewed changes

macumber added 9 commits July 20, 2024 17:35

Remove workarounds now that NREL/OpenStudio#5129 is merged

0feb782

Remove Shoebox Model from repo, fetch at configure time

f83e1cb

Remove openstudio_results measure from repo, install from the openstu…

49e8cc2

…dio-coalition-measures

Find openstudio_results and ShoeboxModel when running in build dir

06a3a6b

Add measure type badges to workflow steps

53cfba1

Measure manager changed argument to update_measures from measure_dir …

ba11995

…to measures_dir. Use both for now in case that changes.

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

dcbdb87

# Conflicts: # src/openstudio_lib/OSDocument.cpp

Clang format

da2d1ed

jmarrec merged commit 55f5cc3 into develop Aug 2, 2024
8 checks passed

jmarrec deleted the measure_fixes branch August 2, 2024 13:36

github-actions bot locked and limited conversation to collaborators Aug 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix issues with MeasureManager #720

Fix issues with MeasureManager #720

macumber commented Jul 5, 2024 •

edited

Loading

macumber commented Jul 12, 2024 •

edited

Loading

macumber commented Jul 14, 2024

jmarrec commented Jul 15, 2024

macumber commented Jul 15, 2024 •

edited

Loading

jmarrec Jul 15, 2024

macumber Jul 16, 2024

jmarrec Jul 15, 2024

macumber Jul 16, 2024 •

edited

Loading

macumber Jul 21, 2024

jmarrec Jul 15, 2024

macumber Jul 16, 2024 •

edited

Loading

macumber Jul 21, 2024

macumber commented Jul 26, 2024

jmarrec commented Jul 31, 2024

macumber commented Aug 1, 2024

Fix issues with MeasureManager #720

Fix issues with MeasureManager #720

Conversation

macumber commented Jul 5, 2024 • edited Loading

macumber commented Jul 12, 2024 • edited Loading

macumber commented Jul 14, 2024

jmarrec commented Jul 15, 2024

macumber commented Jul 15, 2024 • edited Loading

jmarrec Jul 15, 2024

Choose a reason for hiding this comment

macumber Jul 16, 2024

Choose a reason for hiding this comment

jmarrec Jul 15, 2024

Choose a reason for hiding this comment

macumber Jul 16, 2024 • edited Loading

Choose a reason for hiding this comment

macumber Jul 21, 2024

Choose a reason for hiding this comment

jmarrec Jul 15, 2024

Choose a reason for hiding this comment

macumber Jul 16, 2024 • edited Loading

Choose a reason for hiding this comment

macumber Jul 21, 2024

Choose a reason for hiding this comment

macumber commented Jul 26, 2024

jmarrec commented Jul 31, 2024

macumber commented Aug 1, 2024

macumber commented Jul 5, 2024 •

edited

Loading

macumber commented Jul 12, 2024 •

edited

Loading

macumber commented Jul 15, 2024 •

edited

Loading

macumber Jul 16, 2024 •

edited

Loading

macumber Jul 16, 2024 •

edited

Loading