Skip to content

Conversation

@acpaquette
Copy link
Collaborator

@acpaquette acpaquette commented May 19, 2025

Description

Fixes MacOS bundle serialization for IPCE and adds back in the calculator tables

Related Issue

N/A

How Has This Been Validated?

Validated locally and through MacOS testing

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Infrastructure change (changes to things like CI or the build system that do not impact users)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation and I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • I have added myself to the .zenodo.json document.
  • I have added my user impacting change to the CHANGELOG.md document.

Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

@github-actions
Copy link

The build and test suite have started for your pull request.

To view your build log, please reference the build with source version: "PR_5808".

Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch.

1 similar comment
@github-actions
Copy link

The build and test suite have started for your pull request.

To view your build log, please reference the build with source version: "PR_5808".

Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch.

Comment on lines -2316 to -2320
// cumulativeProbabilityDistribution().save(stream, project);
cumulativeProbabilityDistribution().save(stream, project);
stream.writeEndElement(); // end cumulativeProbabilityCalculator

stream.writeStartElement("residualsCumulativeProbabilityCalculator");
// residualsCumulativeProbabilityDistribution().save(stream, project);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hey @kledmundson, I was meaning to email you about this but figured I would ask you here. Was there a reason that these distributions were commented out of the bundle result serialization? If there is I can revert this change but it seemed weird that it was commented out

Copy link
Contributor

Choose a reason for hiding this comment

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

Sadly, I can't recall why/when/how this was done. I agree that it doesn't make sense to be removed specifically from IPCE. That being said, I'm not sure we ever finished properly serializing an IPCE project. Just for kicks I grabbed your code, built it, and ran a bundle both from the command line and in IPCE. Got identical results as expected. Then tried to save the IPCE project and it crashed on me. Don't know why. Based on where we were when we had to stop, I'm not completely sure we had everything serialized properly. Have you tested this in IPCE? And been able to save and restore a project with a bundle in it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I have not but there is a test for bundle results serialization that was failing on Mac and this addresses it. With the commented outlines, the cumulativeProbabilityCalculator and residualsCumulativeProbabilityCalculator elements in the XML where empty causing issues when trying to read the serialized bundle results back in.

It doesn't surprise me that IPCE crashed while saving a bundle/project as we made a number of changes to the XML writing updating to qt 5.15. I just don't know if the crash existed prior to that XML change since IPCE isn't something we poke at regularly.

Copy link
Contributor

Choose a reason for hiding this comment

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

Then, I would say go ahead and merge it if only to get the tests passing. We If IPCE ever lives again we'll want those stats to persist in the project and the serialization will have to be re-sorted out anyway.

@github-actions
Copy link

The build and test suite have started for your pull request.

To view your build log, please reference the build with source version: "PR_5808".

Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch.

@github-actions
Copy link

The build and test suite have started for your pull request.

To view your build log, please reference the build with source version: "PR_5808".

Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch.

chkim-usgs
chkim-usgs previously approved these changes Aug 1, 2025
Copy link
Contributor

@chkim-usgs chkim-usgs left a comment

Choose a reason for hiding this comment

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

Resolve conflicts and should be good to go

@github-actions
Copy link

github-actions bot commented Aug 1, 2025

The build and test suite have started for your pull request.

To view your build log, please reference the build with source version: "PR_5808".

Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch.

@acpaquette acpaquette merged commit d6da430 into DOI-USGS:dev Aug 1, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants