Skip to content

Commit 797338b

Browse files
jpivarskijpivarski
authored
Merge pull request #9 from histogrammar/update-to-Scala-2.11
Update to scala 2.11
2 parents ef870fb + 43b1334 commit 797338b

File tree

24 files changed

+268
-158
lines changed

24 files changed

+268
-158
lines changed

‎.travis.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,10 @@ jdk:
77
- oraclejdk7
88
- oraclejdk8
99
- openjdk7
10+
11+
env:
12+
matrix:
13+
- SCALA_VERSION=2.10
14+
- SCALA_VERSION=2.11
15+
16+
script: "mvn clean install -P scala-${SCALA_VERSION}"

‎README.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@ Scala implementation of Histogrammar
33

44
See [histogrammar.org](http://histogrammar.org) for a complete introduction to Histogrammar.
55

6-
This is a Scala implementation for Scala version 2.10.
7-
8-
**FIXME:** add tests (and check implementation) for Scala 2.11. It should work, but still.
6+
This is a Scala implementation for Scala versions 2.10 and 2.11.
97

108
Installation
119
============
1210

1311
Histogrammar has a standard Maven POM. With Maven 3+, run
1412

1513
```bash
16-
mvn install
14+
mvn install -P scala-2.10
15+
```
16+
17+
or
18+
19+
```bash
20+
mvn install -P scala-2.11
1721
```
1822

1923
in the base directory (to compile everything) or one of the subdirectories. All subdirectories depend on `core`, so this must be installed first.

‎bokeh/pom.xml‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<inceptionYear>2016</inceptionYear>
2121

2222
<groupId>org.diana-hep</groupId>
23-
<artifactId>histogrammar-bokeh</artifactId>
23+
<artifactId>histogrammar-bokeh_${scala.binary.version}</artifactId>
2424
<version>1.0.0</version>
2525
<packaging>jar</packaging>
2626

@@ -32,11 +32,35 @@
3232
</license>
3333
</licenses>
3434

35+
<profiles>
36+
<profile>
37+
<id>scala-2.10</id>
38+
<activation>
39+
<property><name>!scala-2.11</name></property>
40+
</activation>
41+
<properties>
42+
<scala.version>2.10.6</scala.version>
43+
<scala.binary.version>2.10</scala.binary.version>
44+
<maven.compiler.source>1.7</maven.compiler.source>
45+
<maven.compiler.target>1.7</maven.compiler.target>
46+
</properties>
47+
</profile>
48+
49+
<profile>
50+
<id>scala-2.11</id>
51+
<activation>
52+
<property><name>scala-2.11</name></property>
53+
</activation>
54+
<properties>
55+
<scala.version>2.11.8</scala.version>
56+
<scala.binary.version>2.11</scala.binary.version>
57+
<maven.compiler.source>1.8</maven.compiler.source>
58+
<maven.compiler.target>1.8</maven.compiler.target>
59+
</properties>
60+
</profile>
61+
</profiles>
62+
3563
<properties>
36-
<maven.compiler.source>1.7</maven.compiler.source>
37-
<maven.compiler.target>1.7</maven.compiler.target>
38-
<scala.tools.version>2.10</scala.tools.version>
39-
<scala.version>2.10.5</scala.version>
4064
<encoding>UTF-8</encoding>
4165
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4266
</properties>
@@ -50,13 +74,13 @@
5074

5175
<dependency>
5276
<groupId>org.diana-hep</groupId>
53-
<artifactId>histogrammar</artifactId>
77+
<artifactId>histogrammar_${scala.binary.version}</artifactId>
5478
<version>1.0.0</version>
5579
</dependency>
5680

5781
<dependency>
5882
<groupId>io.continuum.bokeh</groupId>
59-
<artifactId>bokeh_${scala.tools.version}</artifactId>
83+
<artifactId>bokeh_${scala.binary.version}</artifactId>
6084
<version>0.6</version>
6185
<scope>provided</scope>
6286
</dependency>
@@ -73,7 +97,7 @@
7397
<!-- see http://davidb.github.com/scala-maven-plugin -->
7498
<groupId>net.alchim31.maven</groupId>
7599
<artifactId>scala-maven-plugin</artifactId>
76-
<version>3.2.1</version>
100+
<version>3.2.2</version>
77101
<executions>
78102
<execution>
79103
<goals>

‎bokeh/src/main/scala/org/dianahep/histogrammar/bokeh.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,24 +346,24 @@ package object bokeh extends Tools {
346346

347347
//////////////////////////////////////////////////////////////// methods for FractionedHistogram
348348

349-
implicit def anyBinnedToFractionedHistogramMethodsBokeh[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Binned[Counted, U, O, N]]): FractionedHistogramMethodsBokeh =
349+
implicit def anyBinnedToFractionedHistogramMethodsBokeh[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Binned[Counted, U, O, N], Binned[Counted, U, O, N]]): FractionedHistogramMethodsBokeh =
350350
new FractionedHistogramMethodsBokeh(anyBinnedToFractionedHistogramMethods(hist).fractioned)
351351
implicit def anyBinningToFractionedHistogramMethodsBokeh[DATUM, U <: Container[U] with Aggregation{type Datum >: DATUM}, O <: Container[O] with Aggregation{type Datum >: DATUM}, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, Binning[DATUM, Counting, U, O, N]]): FractionedHistogramMethodsBokeh =
352352
new FractionedHistogramMethodsBokeh(anyBinningToFractionedHistogramMethods(hist).fractioned)
353-
implicit def anySelectedBinnedToFractionedHistogramMethodsBokeh[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Selected[Binned[Counted, U, O, N]]]): FractionedHistogramMethodsBokeh =
353+
implicit def anySelectedBinnedToFractionedHistogramMethodsBokeh[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Selected[Binned[Counted, U, O, N]], Selected[Binned[Counted, U, O, N]]]): FractionedHistogramMethodsBokeh =
354354
new FractionedHistogramMethodsBokeh(anySelectedBinnedToFractionedHistogramMethods(hist).fractioned)
355355
implicit def anySelectingBinningToFractionedHistogramMethodsBokeh[DATUM, U <: Container[U] with Aggregation{type Datum >: DATUM}, O <: Container[O] with Aggregation{type Datum >: DATUM}, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, Selecting[DATUM, Binning[DATUM, Counting, U, O, N]]]): FractionedHistogramMethodsBokeh =
356356
new FractionedHistogramMethodsBokeh(anySelectingBinningToFractionedHistogramMethods(hist).fractioned)
357-
implicit def anySparselyBinnedToFractionedHistogramMethodsBokeh[N <: Container[N] with NoAggregation](hist: Fractioned[SparselyBinned[Counted, N]]): FractionedHistogramMethodsBokeh =
357+
implicit def anySparselyBinnedToFractionedHistogramMethodsBokeh[N <: Container[N] with NoAggregation](hist: Fractioned[SparselyBinned[Counted, N], SparselyBinned[Counted, N]]): FractionedHistogramMethodsBokeh =
358358
new FractionedHistogramMethodsBokeh(anySparselyBinnedToFractionedHistogramMethods(hist).fractioned)
359359
implicit def anySparselyBinningToFractionedHistogramMethodsBokeh[DATUM, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, SparselyBinning[DATUM, Counting, N]]): FractionedHistogramMethodsBokeh =
360360
new FractionedHistogramMethodsBokeh(anySparselyBinningToFractionedHistogramMethods(hist).fractioned)
361-
implicit def anySelectedSparselyBinnedToFractionedHistogramMethodsBokeh[N <: Container[N] with NoAggregation](hist: Fractioned[Selected[SparselyBinned[Counted, N]]]): FractionedHistogramMethodsBokeh =
361+
implicit def anySelectedSparselyBinnedToFractionedHistogramMethodsBokeh[N <: Container[N] with NoAggregation](hist: Fractioned[Selected[SparselyBinned[Counted, N]], Selected[SparselyBinned[Counted, N]]]): FractionedHistogramMethodsBokeh =
362362
new FractionedHistogramMethodsBokeh(anySelectedSparselyBinnedToFractionedHistogramMethods(hist).fractioned)
363363
implicit def anySelectingSparselyBinningToFractionedHistogramMethodsBokeh[DATUM, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, Selecting[DATUM, SparselyBinning[DATUM, Counting, N]]]): FractionedHistogramMethodsBokeh =
364364
new FractionedHistogramMethodsBokeh(anySelectingSparselyBinningToFractionedHistogramMethods(hist).fractioned)
365365

366-
class FractionedHistogramMethodsBokeh(val fractioned: Fractioned[Selected[Binned[Counted, Counted, Counted, Counted]]])
366+
class FractionedHistogramMethodsBokeh(val fractioned: Fractioned[Selected[Binned[Counted, Counted, Counted, Counted]], Selected[Binned[Counted, Counted, Counted, Counted]]])
367367

368368
//////////////////////////////////////////////////////////////// methods for TwoDimensionallyHistogram and TwoDimensionallySparselyHistogram
369369

‎core/pom.xml‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<inceptionYear>2016</inceptionYear>
2121

2222
<groupId>org.diana-hep</groupId>
23-
<artifactId>histogrammar</artifactId>
23+
<artifactId>histogrammar_${scala.binary.version}</artifactId>
2424
<version>1.0.0</version>
2525
<packaging>jar</packaging>
2626

@@ -32,6 +32,34 @@
3232
</license>
3333
</licenses>
3434

35+
<profiles>
36+
<profile>
37+
<id>scala-2.10</id>
38+
<activation>
39+
<property><name>!scala-2.11</name></property>
40+
</activation>
41+
<properties>
42+
<scala.version>2.10.6</scala.version>
43+
<scala.binary.version>2.10</scala.binary.version>
44+
<maven.compiler.source>1.7</maven.compiler.source>
45+
<maven.compiler.target>1.7</maven.compiler.target>
46+
</properties>
47+
</profile>
48+
49+
<profile>
50+
<id>scala-2.11</id>
51+
<activation>
52+
<property><name>scala-2.11</name></property>
53+
</activation>
54+
<properties>
55+
<scala.version>2.11.8</scala.version>
56+
<scala.binary.version>2.11</scala.binary.version>
57+
<maven.compiler.source>1.8</maven.compiler.source>
58+
<maven.compiler.target>1.8</maven.compiler.target>
59+
</properties>
60+
</profile>
61+
</profiles>
62+
3563
<reporting>
3664
<plugins>
3765
<plugin>
@@ -43,10 +71,6 @@
4371
</reporting>
4472

4573
<properties>
46-
<maven.compiler.source>1.7</maven.compiler.source>
47-
<maven.compiler.target>1.7</maven.compiler.target>
48-
<scala.tools.version>2.10</scala.tools.version>
49-
<scala.version>2.10.5</scala.version>
5074
<encoding>UTF-8</encoding>
5175
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5276
</properties>
@@ -60,8 +84,8 @@
6084

6185
<dependency>
6286
<groupId>org.scalatest</groupId>
63-
<artifactId>scalatest_${scala.tools.version}</artifactId>
64-
<version>2.2.6</version>
87+
<artifactId>scalatest_${scala.binary.version}</artifactId>
88+
<version>2.2.5</version>
6589
<scope>test</scope>
6690
</dependency>
6791

@@ -77,7 +101,7 @@
77101
<!-- see http://davidb.github.com/scala-maven-plugin -->
78102
<groupId>net.alchim31.maven</groupId>
79103
<artifactId>scala-maven-plugin</artifactId>
80-
<version>3.2.1</version>
104+
<version>3.2.2</version>
81105
<executions>
82106
<execution>
83107
<goals>

‎core/src/main/scala/org/dianahep/histogrammar/ascii.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -362,24 +362,24 @@ package object ascii {
362362

363363
//////////////////////////////////////////////////////////////// methods for FractionedHistogram
364364

365-
implicit def anyBinnedToFractionedHistogramMethodsAscii[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Binned[Counted, U, O, N]]): FractionedHistogramMethodsAscii =
365+
implicit def anyBinnedToFractionedHistogramMethodsAscii[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Binned[Counted, U, O, N], Binned[Counted, U, O, N]]): FractionedHistogramMethodsAscii =
366366
new FractionedHistogramMethodsAscii(anyBinnedToFractionedHistogramMethods(hist).fractioned)
367367
implicit def anyBinningToFractionedHistogramMethodsAscii[DATUM, U <: Container[U] with Aggregation{type Datum >: DATUM}, O <: Container[O] with Aggregation{type Datum >: DATUM}, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, Binning[DATUM, Counting, U, O, N]]): FractionedHistogramMethodsAscii =
368368
new FractionedHistogramMethodsAscii(anyBinningToFractionedHistogramMethods(hist).fractioned)
369-
implicit def anySelectedBinnedToFractionedHistogramMethodsAscii[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Selected[Binned[Counted, U, O, N]]]): FractionedHistogramMethodsAscii =
369+
implicit def anySelectedBinnedToFractionedHistogramMethodsAscii[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Selected[Binned[Counted, U, O, N]], Selected[Binned[Counted, U, O, N]]]): FractionedHistogramMethodsAscii =
370370
new FractionedHistogramMethodsAscii(anySelectedBinnedToFractionedHistogramMethods(hist).fractioned)
371371
implicit def anySelectingBinningToFractionedHistogramMethodsAscii[DATUM, U <: Container[U] with Aggregation{type Datum >: DATUM}, O <: Container[O] with Aggregation{type Datum >: DATUM}, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, Selecting[DATUM, Binning[DATUM, Counting, U, O, N]]]): FractionedHistogramMethodsAscii =
372372
new FractionedHistogramMethodsAscii(anySelectingBinningToFractionedHistogramMethods(hist).fractioned)
373-
implicit def anySparselyBinnedToFractionedHistogramMethodsAscii[N <: Container[N] with NoAggregation](hist: Fractioned[SparselyBinned[Counted, N]]): FractionedHistogramMethodsAscii =
373+
implicit def anySparselyBinnedToFractionedHistogramMethodsAscii[N <: Container[N] with NoAggregation](hist: Fractioned[SparselyBinned[Counted, N], SparselyBinned[Counted, N]]): FractionedHistogramMethodsAscii =
374374
new FractionedHistogramMethodsAscii(anySparselyBinnedToFractionedHistogramMethods(hist).fractioned)
375375
implicit def anySparselyBinningToFractionedHistogramMethodsAscii[DATUM, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, SparselyBinning[DATUM, Counting, N]]): FractionedHistogramMethodsAscii =
376376
new FractionedHistogramMethodsAscii(anySparselyBinningToFractionedHistogramMethods(hist).fractioned)
377-
implicit def anySelectedSparselyBinnedToFractionedHistogramMethodsAscii[N <: Container[N] with NoAggregation](hist: Fractioned[Selected[SparselyBinned[Counted, N]]]): FractionedHistogramMethodsAscii =
377+
implicit def anySelectedSparselyBinnedToFractionedHistogramMethodsAscii[N <: Container[N] with NoAggregation](hist: Fractioned[Selected[SparselyBinned[Counted, N]], Selected[SparselyBinned[Counted, N]]]): FractionedHistogramMethodsAscii =
378378
new FractionedHistogramMethodsAscii(anySelectedSparselyBinnedToFractionedHistogramMethods(hist).fractioned)
379379
implicit def anySelectingSparselyBinningToFractionedHistogramMethodsAscii[DATUM, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, Selecting[DATUM, SparselyBinning[DATUM, Counting, N]]]): FractionedHistogramMethodsAscii =
380380
new FractionedHistogramMethodsAscii(anySelectingSparselyBinningToFractionedHistogramMethods(hist).fractioned)
381381

382-
class FractionedHistogramMethodsAscii(val fractioned: Fractioned[Selected[Binned[Counted, Counted, Counted, Counted]]]) {
382+
class FractionedHistogramMethodsAscii(val fractioned: Fractioned[Selected[Binned[Counted, Counted, Counted, Counted]], Selected[Binned[Counted, Counted, Counted, Counted]]]) {
383383
/** Print an ASCII representation of a histogram for debugging on headless systems. Limited to 80 columns. */
384384
def println {
385385
println({(n: Double, d: Double, z: Double) => n/d}, 80)

‎core/src/main/scala/org/dianahep/histogrammar/defs.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ package object histogrammar {
510510
}
511511

512512
implicit class StringIndex(val string: String) extends CollectionIndex {
513-
override def toString() = "\"" + scala.util.parsing.json.JSONFormat.quoteString(string) + "\""
513+
override def toString() = "\"" + string + "\""
514514
}
515515
object StringIndex {
516516
def unapply(x: StringIndex) = Some(x.string)
@@ -1049,32 +1049,32 @@ package object histogrammar {
10491049

10501050
//////////////////////////////////////////////////////////////// methods for FractionedHistogram
10511051

1052-
implicit def anyBinnedToFractionedHistogramMethods[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Binned[Counted, U, O, N]]): FractionedHistogramMethods =
1052+
implicit def anyBinnedToFractionedHistogramMethods[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Binned[Counted, U, O, N], Binned[Counted, U, O, N]]): FractionedHistogramMethods =
10531053
new FractionedHistogramMethods(new Fractioned(hist.entries, hist.quantityName, anyBinnedToHistogramMethods(hist.numerator).selected, anyBinnedToHistogramMethods(hist.denominator).selected))
10541054

10551055
implicit def anyBinningToFractionedHistogramMethods[DATUM, U <: Container[U] with Aggregation{type Datum >: DATUM}, O <: Container[O] with Aggregation{type Datum >: DATUM}, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, Binning[DATUM, Counting, U, O, N]]): FractionedHistogramMethods =
10561056
anyBinnedToFractionedHistogramMethods(hist.toImmutable)
10571057

1058-
implicit def anySelectedBinnedToFractionedHistogramMethods[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Selected[Binned[Counted, U, O, N]]]): FractionedHistogramMethods =
1058+
implicit def anySelectedBinnedToFractionedHistogramMethods[U <: Container[U] with NoAggregation, O <: Container[O] with NoAggregation, N <: Container[N] with NoAggregation](hist: Fractioned[Selected[Binned[Counted, U, O, N]], Selected[Binned[Counted, U, O, N]]]): FractionedHistogramMethods =
10591059
new FractionedHistogramMethods(new Fractioned(hist.entries, hist.quantityName, anySelectedBinnedToHistogramMethods(hist.numerator).selected, anySelectedBinnedToHistogramMethods(hist.denominator).selected))
10601060

10611061
implicit def anySelectingBinningToFractionedHistogramMethods[DATUM, U <: Container[U] with Aggregation{type Datum >: DATUM}, O <: Container[O] with Aggregation{type Datum >: DATUM}, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, Selecting[DATUM, Binning[DATUM, Counting, U, O, N]]]): FractionedHistogramMethods =
10621062
anySelectedBinnedToFractionedHistogramMethods(hist.toImmutable)
10631063

1064-
implicit def anySparselyBinnedToFractionedHistogramMethods[N <: Container[N] with NoAggregation](hist: Fractioned[SparselyBinned[Counted, N]]): FractionedHistogramMethods =
1064+
implicit def anySparselyBinnedToFractionedHistogramMethods[N <: Container[N] with NoAggregation](hist: Fractioned[SparselyBinned[Counted, N], SparselyBinned[Counted, N]]): FractionedHistogramMethods =
10651065
new FractionedHistogramMethods(new Fractioned(hist.entries, hist.quantityName, anySparselyBinnedToHistogramMethods(hist.numerator).selected, anySparselyBinnedToHistogramMethods(hist.denominator).selected))
10661066

10671067
implicit def anySparselyBinningToFractionedHistogramMethods[DATUM, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, SparselyBinning[DATUM, Counting, N]]): FractionedHistogramMethods =
10681068
anySparselyBinnedToFractionedHistogramMethods(hist.toImmutable)
10691069

1070-
implicit def anySelectedSparselyBinnedToFractionedHistogramMethods[N <: Container[N] with NoAggregation](hist: Fractioned[Selected[SparselyBinned[Counted, N]]]): FractionedHistogramMethods =
1070+
implicit def anySelectedSparselyBinnedToFractionedHistogramMethods[N <: Container[N] with NoAggregation](hist: Fractioned[Selected[SparselyBinned[Counted, N]], Selected[SparselyBinned[Counted, N]]]): FractionedHistogramMethods =
10711071
new FractionedHistogramMethods(new Fractioned(hist.entries, hist.quantityName, anySelectedSparselyBinnedToHistogramMethods(hist.numerator).selected, anySelectedSparselyBinnedToHistogramMethods(hist.denominator).selected))
10721072

10731073
implicit def anySelectingSparselyBinningToFractionedHistogramMethods[DATUM, N <: Container[N] with Aggregation{type Datum >: DATUM}](hist: Fractioning[DATUM, Selecting[DATUM, SparselyBinning[DATUM, Counting, N]]]): FractionedHistogramMethods =
10741074
anySelectedSparselyBinnedToFractionedHistogramMethods(hist.toImmutable)
10751075

10761076
/** Methods that are implicitly added to container combinations that look like fractioned histograms. */
1077-
class FractionedHistogramMethods(val fractioned: Fractioned[Selected[Binned[Counted, Counted, Counted, Counted]]]) {
1077+
class FractionedHistogramMethods(val fractioned: Fractioned[Selected[Binned[Counted, Counted, Counted, Counted]], Selected[Binned[Counted, Counted, Counted, Counted]]]) {
10781078
def numeratorBinned = fractioned.numerator.cut
10791079
def denominatorBinned = fractioned.denominator.cut
10801080

‎core/src/main/scala/org/dianahep/histogrammar/primitives/average.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
package org.dianahep
1616

17+
import scala.language.existentials
18+
1719
import org.dianahep.histogrammar.json._
1820
import org.dianahep.histogrammar.util._
1921

‎core/src/main/scala/org/dianahep/histogrammar/primitives/bag.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
package org.dianahep
1616

17+
import scala.language.existentials
18+
1719
import scala.reflect.classTag
1820
import scala.reflect.ClassTag
1921

0 commit comments

Comments
 (0)