TS typing for Dataframe (#2382)

* initial TS typing

* first cut at Dataframe TS typing

* more Dataframe typing

* comments

* more Dataframe cleanup

* PR review fixes and improvements
This commit is contained in:
Bruce Martin
2021-08-17 10:43:40 -07:00
committed by GitHub
parent 3fdf5cac9d
commit 45cecad76a
39 changed files with 1298 additions and 1124 deletions
@@ -8,7 +8,7 @@ function float32Conversion(f: any) {
describe("Dataframe column summary", () => {
test("empty column test", () => {
const df = Dataframe.Dataframe.create([0, 1], [[]]);
const summary = df.icol(0).summarize();
const summary = df.icol(0).summarizeCategorical();
expect(summary).toEqual(
expect.objectContaining({
categorical: true,
@@ -31,7 +31,6 @@ describe("Dataframe column summary", () => {
[1],
],
null,
// @ts-expect-error ts-migrate(2345) FIXME: Argument of type 'KeyIndex' is not assignable to p... Remove this comment to see the full error message
new Dataframe.KeyIndex([
"name",
"nameString",
@@ -42,7 +41,7 @@ describe("Dataframe column summary", () => {
])
);
expect(df.icol(0).summarize()).toEqual(
expect(df.icol(0).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: ["n1"],
@@ -50,7 +49,7 @@ describe("Dataframe column summary", () => {
numCategories: 1,
})
);
expect(df.icol(1).summarize()).toEqual(
expect(df.icol(1).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: ["hi"],
@@ -58,7 +57,7 @@ describe("Dataframe column summary", () => {
numCategories: 1,
})
);
expect(df.icol(2).summarize()).toEqual(
expect(df.icol(2).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: [true],
@@ -66,7 +65,7 @@ describe("Dataframe column summary", () => {
numCategories: 1,
})
);
expect(df.icol(3).summarize()).toEqual(
expect(df.icol(3).summarizeContinuous()).toEqual(
expect.objectContaining({
categorical: false,
min: float32Conversion(39.3),
@@ -76,7 +75,7 @@ describe("Dataframe column summary", () => {
pinf: 0,
})
);
expect(df.icol(4).summarize()).toEqual(
expect(df.icol(4).summarizeContinuous()).toEqual(
expect.objectContaining({
categorical: false,
min: 99,
@@ -86,7 +85,7 @@ describe("Dataframe column summary", () => {
pinf: 0,
})
);
expect(df.icol(5).summarize()).toEqual(
expect(df.icol(5).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: [1],
@@ -108,7 +107,6 @@ describe("Dataframe column summary", () => {
[1, false, "0"],
],
null,
// @ts-expect-error ts-migrate(2345) FIXME: Argument of type 'KeyIndex' is not assignable to p... Remove this comment to see the full error message
new Dataframe.KeyIndex([
"name",
"nameString",
@@ -119,7 +117,7 @@ describe("Dataframe column summary", () => {
])
);
expect(df.icol(0).summarize()).toEqual(
expect(df.icol(0).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: expect.arrayContaining(["n0", "n1", "n2"]),
@@ -131,7 +129,7 @@ describe("Dataframe column summary", () => {
numCategories: 3,
})
);
expect(df.icol(1).summarize()).toEqual(
expect(df.icol(1).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: expect.arrayContaining(["hi", "bye"]),
@@ -142,7 +140,7 @@ describe("Dataframe column summary", () => {
numCategories: 2,
})
);
expect(df.icol(2).summarize()).toEqual(
expect(df.icol(2).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: expect.arrayContaining([true, false]),
@@ -153,7 +151,7 @@ describe("Dataframe column summary", () => {
numCategories: 2,
})
);
expect(df.icol(3).summarize()).toEqual(
expect(df.icol(3).summarizeContinuous()).toEqual(
expect.objectContaining({
categorical: false,
min: 0,
@@ -163,7 +161,7 @@ describe("Dataframe column summary", () => {
pinf: 0,
})
);
expect(df.icol(4).summarize()).toEqual(
expect(df.icol(4).summarizeContinuous()).toEqual(
expect.objectContaining({
categorical: false,
min: 99,
@@ -173,7 +171,7 @@ describe("Dataframe column summary", () => {
pinf: 0,
})
);
expect(df.icol(5).summarize()).toEqual(
expect(df.icol(5).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: expect.arrayContaining([1, false, "0"]),
@@ -205,7 +203,6 @@ describe("Dataframe column summary", () => {
[1, false, "0", "0"],
],
null,
// @ts-expect-error ts-migrate(2345) FIXME: Argument of type 'KeyIndex' is not assignable to p... Remove this comment to see the full error message
new Dataframe.KeyIndex([
"name",
"nameString",
@@ -216,7 +213,7 @@ describe("Dataframe column summary", () => {
])
);
expect(df.icol(0).summarize()).toEqual(
expect(df.icol(0).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: expect.arrayContaining(["n0", "n1", "n2"]),
@@ -228,7 +225,7 @@ describe("Dataframe column summary", () => {
numCategories: 3,
})
);
expect(df.icol(1).summarize()).toEqual(
expect(df.icol(1).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: expect.arrayContaining(["hi", "bye"]),
@@ -239,7 +236,7 @@ describe("Dataframe column summary", () => {
numCategories: 2,
})
);
expect(df.icol(2).summarize()).toEqual(
expect(df.icol(2).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: expect.arrayContaining([true, false]),
@@ -250,7 +247,7 @@ describe("Dataframe column summary", () => {
numCategories: 2,
})
);
expect(df.icol(3).summarize()).toEqual(
expect(df.icol(3).summarizeContinuous()).toEqual(
expect.objectContaining({
categorical: false,
min: float32Conversion(39.3),
@@ -260,7 +257,7 @@ describe("Dataframe column summary", () => {
pinf: 1,
})
);
expect(df.icol(4).summarize()).toEqual(
expect(df.icol(4).summarizeContinuous()).toEqual(
expect.objectContaining({
categorical: false,
min: 99,
@@ -270,7 +267,7 @@ describe("Dataframe column summary", () => {
pinf: 0,
})
);
expect(df.icol(5).summarize()).toEqual(
expect(df.icol(5).summarizeCategorical()).toEqual(
expect.objectContaining({
categorical: true,
categories: expect.arrayContaining([1, false, "0"]),