categorize histograms can handle null inputs

bump up version to 1.0.20
histogrammar · Apr 2, 2021 · 962d691 · 962d691
1 parent a77c8a0
commit 962d691
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/core/deploy-scala-2.10.xml b/core/deploy-scala-2.10.xml
@@ -17,12 +17,12 @@
 
   <name>histogrammar</name>
   <description>Histogram abstraction to simplify complex aggregations in distributed environments.</description>
-  <url>http://histogrammar.org</url>
+  <url>https://histogrammar.github.io/histogrammar-docs</url>
   <inceptionYear>2016</inceptionYear>
 
-  <groupId>org.diana-hep</groupId>
+  <groupId>io.github.histogrammar</groupId>
   <artifactId>histogrammar_2.10</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.20</version>
   <packaging>jar</packaging>
 
   <licenses>

diff --git a/core/deploy-scala-2.11.xml b/core/deploy-scala-2.11.xml
@@ -22,7 +22,7 @@
 
   <groupId>io.github.histogrammar</groupId>
   <artifactId>histogrammar_2.11</artifactId>
-  <version>1.0.11</version>
+  <version>1.0.20</version>
   <packaging>jar</packaging>
 
   <licenses>

diff --git a/core/deploy-scala-2.12.xml b/core/deploy-scala-2.12.xml
@@ -22,7 +22,7 @@
 
   <groupId>io.github.histogrammar</groupId>
   <artifactId>histogrammar_2.12</artifactId>
-  <version>1.0.11</version>
+  <version>1.0.20</version>
   <packaging>jar</packaging>
 
   <licenses>

diff --git a/core/pom.xml b/core/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>io.github.histogrammar</groupId>
   <artifactId>histogrammar_${scala.binary.version}</artifactId>
-  <version>1.0.11</version>
+  <version>1.0.20</version>
   <packaging>jar</packaging>
 
   <licenses>

diff --git a/core/src/main/scala/org/dianahep/histogrammar/primitives/categorize.scala b/core/src/main/scala/org/dianahep/histogrammar/primitives/categorize.scala
@@ -235,8 +235,8 @@ Unlike [[org.dianahep.histogrammar.SparselyBin]], this aggregator has the potent
     def fill[SUB <: Datum](datum: SUB, weight: Double = 1.0) {
       checkForCrossReferences()
       if (weight > 0.0) {
-        val q = quantity(datum)
-
+        val qd = quantity(datum)
+        val q = if (qd == null) "NaN" else qd
         if (!(bins contains q))
           bins(q) = value.zero
         bins(q).fill(datum, weight)

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
   <groupId>io.github.histogrammar</groupId>
   <artifactId>histogrammar-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.11</version>
+  <version>1.0.20</version>
 
   <licenses>
     <license>

diff --git a/sparksql/deploy-scala-2.10.xml b/sparksql/deploy-scala-2.10.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.diana-hep</groupId>
   <artifactId>histogrammar-sparksql_2.10</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.20</version>
   <packaging>jar</packaging>
 
   <licenses>

diff --git a/sparksql/deploy-scala-2.11.xml b/sparksql/deploy-scala-2.11.xml
@@ -22,7 +22,7 @@
 
   <groupId>io.github.histogrammar</groupId>
   <artifactId>histogrammar-sparksql_2.11</artifactId>
-  <version>1.0.11</version>
+  <version>1.0.20</version>
   <packaging>jar</packaging>
 
   <licenses>

diff --git a/sparksql/deploy-scala-2.12.xml b/sparksql/deploy-scala-2.12.xml
@@ -22,7 +22,7 @@
 
   <groupId>io.github.histogrammar</groupId>
   <artifactId>histogrammar-sparksql_2.12</artifactId>
-  <version>1.0.11</version>
+  <version>1.0.20</version>
   <packaging>jar</packaging>
 
   <licenses>

diff --git a/sparksql/pom.xml b/sparksql/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>io.github.histogrammar</groupId>
   <artifactId>histogrammar-sparksql_${scala.binary.version}</artifactId>
-  <version>1.0.11</version>
+  <version>1.0.20</version>
   <packaging>jar</packaging>
 
   <licenses>