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

DM-13084: Be smarter about combining metadata from FITS headers #32

Merged
merged 4 commits into from Jan 23, 2018

Conversation

r-owen
Copy link
Contributor

@r-owen r-owen commented Jan 11, 2018

No description provided.

and the same test for PropertyList.copy
auto vp = std::make_shared<vector<boost::any>>(*(sj->second));
_set(dest, vp);
}
}
Copy link
Contributor Author

@r-owen r-owen Jan 16, 2018

Choose a reason for hiding this comment

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

There is a small bit of code duplication here: _set(det, vp). I thought about eliminating it by initializing vp to a blank vector outside of the if/else, appending to it in the asScalar branch and replacing it in the else branch. I felt the current code might be a bit easier to read, but will gladly change it on request.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think that's fine.

virtual ~PropertyList(void);

// Accessors
/**
* Make a deep copy the PropertyList and all of its contents.
Copy link
Contributor

Choose a reason for hiding this comment

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

"copy of the"

// Accessors

/**
* Make a deep copy the PropertySet and all of its contents.
Copy link
Contributor

Choose a reason for hiding this comment

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

"copy of the"

virtual void combine(ConstPtr source);
// All vectors from the source are add()ed to the destination with the
// same names. Types must match.
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this ("types must match") move up to the doxygen comment instead of being removed? Or is the @throws TypeError sufficient?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll add a note to the doc.

AnyMap::iterator _find(std::string const& name);

/* Find2 the property name (possibly hierarchical). Const version.
Copy link
Contributor

Choose a reason for hiding this comment

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

"Find2"?

auto vp = std::make_shared<vector<boost::any>>(*(sj->second));
_set(dest, vp);
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that's fine.

@r-owen r-owen merged commit c2aa5ea into master Jan 23, 2018
@ktlim ktlim deleted the tickets/DM-13084 branch August 25, 2018 06:44
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.

None yet

2 participants