Skip to content

Bug fixes to categorize and sparselybin for use with sparksql #29

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

Merged
jpivarski merged 1 commit into from
Aug 15, 2017
Merged

Bug fixes to categorize and sparselybin for use with sparksql #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions histogrammar/primitives/categorize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ def __iadd__(self, other):
self.entries += other.entries
for k in self.keySet.union(other.keySet):
if k in self.bins and k in other.bins:
bins[k] += other.bins[k]
self.bins[k] += other.bins[k]
elif k not in self.bins and k in other.bins:
bins[k] = self.bins[k].copy()
self.bins[k] = other.bins[k].copy()
return self
else:
raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
Expand Down
2 changes: 1 addition & 1 deletion histogrammar/primitives/sparselybin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ def _numpy(self, data, weights, shape):
self.entries += float(newentries)

def _sparksql(self, jvm, converter):
return converter.SparselyBin(self.binWidth, quantity.asSparkSQL(), self.value._sparksql(jvm, converter), self.nanflow._sparksql(jvm, converter), self.origin)
return converter.SparselyBin(self.binWidth, self.quantity.asSparkSQL(), self.value._sparksql(jvm, converter), self.nanflow._sparksql(jvm, converter), self.origin)

@property
def children(self):
Expand Down