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 extra comma in cnetstats output #4398

Merged
merged 1 commit into from
Apr 16, 2021
Merged

Conversation

tgiroux
Copy link
Contributor

@tgiroux tgiroux commented Apr 13, 2021

Description

There were a few places in ControlNetFilter and ControlNetStatistics responsible for an extra comma being produced in the flat file output. Most changes are straightforward.
Removing the comma in ControlNetFilter::CubeStatsHeader required that I prepend a comma to a few strings in places where CubeStatsHeader is called.
I also updated the tests so everything should be passing.

Related Issue

#3700

Motivation and Context

How Has This Been Tested?

Ran cnetstats on some test input before and after my changes to validate that the extra comma is no longer produced.
All cnetstats gtests passed on linux.

Screenshots (if appropriate):

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)

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.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • I have added myself to the .zenodo.json document.
  • I have added any user impacting changes 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.

Copy link
Collaborator

@acpaquette acpaquette left a comment

Choose a reason for hiding this comment

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

Looks good!

Comment on lines -112 to -113
// The output adds a comma at the end of the first line, increasing the size by 1.
// This is a bug in ControlNetStatistics. Once that is fixed, this test wil fail.
Copy link
Collaborator

Choose a reason for hiding this comment

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

XD

@acpaquette acpaquette merged commit b96d6b2 into DOI-USGS:dev Apr 16, 2021
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.

2 participants