@datagrok-libraries/bio 5.11.1 → 5.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "access": "public"
5
5
  },
6
6
  "friendlyName": "Datagrok bio library",
7
- "version": "5.11.1",
7
+ "version": "5.12.0",
8
8
  "description": "",
9
9
  "dependencies": {
10
10
  "@datagrok-libraries/utils": "^1.10.1",
@@ -1,5 +1,5 @@
1
1
  import * as DG from 'datagrok-api/dg';
2
- import { NodeType } from '../types';
2
+ import { NodeCuttedType, NodeType } from '../types';
3
3
  export interface ITreeHelper {
4
4
  toNewick(node: NodeType | null): string;
5
5
  getLeafList(node: NodeType): NodeType[];
@@ -8,9 +8,11 @@ export interface ITreeHelper {
8
8
  [name: string]: any;
9
9
  }): NodeType | null;
10
10
  treeCutAsLeaves(node: NodeType, cutHeight: number, currentHeight?: number): NodeType[];
11
- treeCutAsTree(node: NodeType, cutHeight: number, currentHeight?: number): NodeType | null;
11
+ treeCutAsTree(node: NodeType, cutHeight: number, keepShorts?: boolean, currentHeight?: number): NodeType | null;
12
12
  setGridOrder(node: NodeType, grid: DG.Grid, leafColName: string): [NodeType, string[]];
13
- cutTreeToGrid(node: NodeType, cutHeight: number, dataDf: DG.DataFrame, leafColName: string, clusterColName: string): void;
13
+ markClusters(tree: NodeCuttedType, dataDf: DG.DataFrame, leafColName: string, clusterColName: string, na?: any): void;
14
+ buildClusters(tree: NodeCuttedType, clusterDf: DG.DataFrame, clusterColName: string, leafColName: string): void;
15
+ cutTreeToGrid(node: NodeType, cutHeight: number, dataDf: DG.DataFrame, leafColName: string, clusterColName: string, na?: any): void;
14
16
  }
15
17
  export declare function getTreeHelper(): Promise<ITreeHelper>;
16
18
  //# sourceMappingURL=tree-helper.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tree-helper.d.ts","sourceRoot":"","sources":["tree-helper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAC;AAGlC,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC;IAExC,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAExC,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAExC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErF,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;IAEvF,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAE1F,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,aAAa,CAAC,IAAI,EAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1H;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,CAO1D"}
1
+ {"version":3,"file":"tree-helper.d.ts","sourceRoot":"","sources":["tree-helper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAC,cAAc,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAC;AAGlD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC;IAExC,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAExC,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAExC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErF,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;IAEvF,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAEhH,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAEtH,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAEhH,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,SAAS,EACnE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;CAChE;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,CAO1D"}
@@ -17,4 +17,4 @@ export function getTreeHelper() {
17
17
  return res;
18
18
  });
19
19
  }
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJlZS1oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0cmVlLWhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFFQSxPQUFPLEtBQUssRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBdUJ0QyxNQUFNLFVBQWdCLGFBQWE7O1FBQ2pDLE1BQU0sUUFBUSxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLElBQUksRUFBRSxlQUFlLEVBQUMsQ0FBQyxDQUFDO1FBQ25GLElBQUksUUFBUSxDQUFDLE1BQU0sS0FBSyxDQUFDO1lBQ3ZCLE1BQU0sSUFBSSxLQUFLLENBQUMsOERBQThELENBQUMsQ0FBQztRQUVsRixNQUFNLEdBQUcsR0FBZ0IsQ0FBQyxNQUFNLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLG1CQUFtQixFQUFpQixDQUFDO1FBQ25HLE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgZ3JvayBmcm9tICdkYXRhZ3Jvay1hcGkvZ3Jvayc7XG5pbXBvcnQgKiBhcyB1aSBmcm9tICdkYXRhZ3Jvay1hcGkvdWknO1xuaW1wb3J0ICogYXMgREcgZnJvbSAnZGF0YWdyb2stYXBpL2RnJztcblxuaW1wb3J0IHtOb2RlVHlwZX0gZnJvbSAnLi4vdHlwZXMnO1xuXG5cbmV4cG9ydCBpbnRlcmZhY2UgSVRyZWVIZWxwZXIge1xuICB0b05ld2ljayhub2RlOiBOb2RlVHlwZSB8IG51bGwpOiBzdHJpbmc7XG5cbiAgZ2V0TGVhZkxpc3Qobm9kZTogTm9kZVR5cGUpOiBOb2RlVHlwZVtdO1xuXG4gIGdldE5vZGVMaXN0KG5vZGU6IE5vZGVUeXBlKTogTm9kZVR5cGVbXTtcblxuICB0cmVlRmlsdGVyQnlMZWF2ZXMobm9kZTogTm9kZVR5cGUsIGxlYXZlczogeyBbbmFtZTogc3RyaW5nXTogYW55IH0pOiBOb2RlVHlwZSB8IG51bGw7XG5cbiAgdHJlZUN1dEFzTGVhdmVzKG5vZGU6IE5vZGVUeXBlLCBjdXRIZWlnaHQ6IG51bWJlciwgY3VycmVudEhlaWdodD86IG51bWJlcik6IE5vZGVUeXBlW107XG5cbiAgdHJlZUN1dEFzVHJlZShub2RlOiBOb2RlVHlwZSwgY3V0SGVpZ2h0OiBudW1iZXIsIGN1cnJlbnRIZWlnaHQ/OiBudW1iZXIpOiBOb2RlVHlwZSB8IG51bGw7XG5cbiAgc2V0R3JpZE9yZGVyKG5vZGU6IE5vZGVUeXBlLCBncmlkOiBERy5HcmlkLCBsZWFmQ29sTmFtZTogc3RyaW5nKTogW05vZGVUeXBlLCBzdHJpbmdbXV07XG5cbiAgY3V0VHJlZVRvR3JpZChub2RlOk5vZGVUeXBlLCBjdXRIZWlnaHQ6IG51bWJlciwgZGF0YURmOiBERy5EYXRhRnJhbWUsIGxlYWZDb2xOYW1lOiBzdHJpbmcsIGNsdXN0ZXJDb2xOYW1lOiBzdHJpbmcpOiB2b2lkO1xufVxuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gZ2V0VHJlZUhlbHBlcigpOiBQcm9taXNlPElUcmVlSGVscGVyPiB7XG4gIGNvbnN0IGZ1bmNMaXN0ID0gREcuRnVuYy5maW5kKHtwYWNrYWdlOiAnUGh5bG9UcmVlVmlld2VyJywgbmFtZTogJ2dldFRyZWVIZWxwZXInfSk7XG4gIGlmIChmdW5jTGlzdC5sZW5ndGggPT09IDApXG4gICAgdGhyb3cgbmV3IEVycm9yKCdQYWNrYWdlIFwiUGh5bG9UcmVlVmlld2VyXCJcIiBtdXN0IGJlIGluc3RhbGxlZCBmb3IgVHJlZUhlbHBlci4nKTtcblxuICBjb25zdCByZXM6IElUcmVlSGVscGVyID0gKGF3YWl0IGZ1bmNMaXN0WzBdLnByZXBhcmUoKS5jYWxsKCkpLmdldE91dHB1dFBhcmFtVmFsdWUoKSBhcyBJVHJlZUhlbHBlcjtcbiAgcmV0dXJuIHJlcztcbn0iXX0=
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJlZS1oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0cmVlLWhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFFQSxPQUFPLEtBQUssRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBNEJ0QyxNQUFNLFVBQWdCLGFBQWE7O1FBQ2pDLE1BQU0sUUFBUSxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLElBQUksRUFBRSxlQUFlLEVBQUMsQ0FBQyxDQUFDO1FBQ25GLElBQUksUUFBUSxDQUFDLE1BQU0sS0FBSyxDQUFDO1lBQ3ZCLE1BQU0sSUFBSSxLQUFLLENBQUMsOERBQThELENBQUMsQ0FBQztRQUVsRixNQUFNLEdBQUcsR0FBZ0IsQ0FBQyxNQUFNLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLG1CQUFtQixFQUFpQixDQUFDO1FBQ25HLE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgZ3JvayBmcm9tICdkYXRhZ3Jvay1hcGkvZ3Jvayc7XG5pbXBvcnQgKiBhcyB1aSBmcm9tICdkYXRhZ3Jvay1hcGkvdWknO1xuaW1wb3J0ICogYXMgREcgZnJvbSAnZGF0YWdyb2stYXBpL2RnJztcblxuaW1wb3J0IHtOb2RlQ3V0dGVkVHlwZSwgTm9kZVR5cGV9IGZyb20gJy4uL3R5cGVzJztcblxuXG5leHBvcnQgaW50ZXJmYWNlIElUcmVlSGVscGVyIHtcbiAgdG9OZXdpY2sobm9kZTogTm9kZVR5cGUgfCBudWxsKTogc3RyaW5nO1xuXG4gIGdldExlYWZMaXN0KG5vZGU6IE5vZGVUeXBlKTogTm9kZVR5cGVbXTtcblxuICBnZXROb2RlTGlzdChub2RlOiBOb2RlVHlwZSk6IE5vZGVUeXBlW107XG5cbiAgdHJlZUZpbHRlckJ5TGVhdmVzKG5vZGU6IE5vZGVUeXBlLCBsZWF2ZXM6IHsgW25hbWU6IHN0cmluZ106IGFueSB9KTogTm9kZVR5cGUgfCBudWxsO1xuXG4gIHRyZWVDdXRBc0xlYXZlcyhub2RlOiBOb2RlVHlwZSwgY3V0SGVpZ2h0OiBudW1iZXIsIGN1cnJlbnRIZWlnaHQ/OiBudW1iZXIpOiBOb2RlVHlwZVtdO1xuXG4gIHRyZWVDdXRBc1RyZWUobm9kZTogTm9kZVR5cGUsIGN1dEhlaWdodDogbnVtYmVyLCBrZWVwU2hvcnRzPzogYm9vbGVhbiwgY3VycmVudEhlaWdodD86IG51bWJlcik6IE5vZGVUeXBlIHwgbnVsbDtcblxuICBzZXRHcmlkT3JkZXIobm9kZTogTm9kZVR5cGUsIGdyaWQ6IERHLkdyaWQsIGxlYWZDb2xOYW1lOiBzdHJpbmcpOiBbTm9kZVR5cGUsIHN0cmluZ1tdXTtcblxuICBtYXJrQ2x1c3RlcnModHJlZTogTm9kZUN1dHRlZFR5cGUsIGRhdGFEZjogREcuRGF0YUZyYW1lLCBsZWFmQ29sTmFtZTogc3RyaW5nLCBjbHVzdGVyQ29sTmFtZTogc3RyaW5nLCBuYT86IGFueSk6IHZvaWQ7XG5cbiAgYnVpbGRDbHVzdGVycyh0cmVlOiBOb2RlQ3V0dGVkVHlwZSwgY2x1c3RlckRmOiBERy5EYXRhRnJhbWUsIGNsdXN0ZXJDb2xOYW1lOiBzdHJpbmcsIGxlYWZDb2xOYW1lOiBzdHJpbmcpOiB2b2lkO1xuXG4gIGN1dFRyZWVUb0dyaWQobm9kZTogTm9kZVR5cGUsIGN1dEhlaWdodDogbnVtYmVyLCBkYXRhRGY6IERHLkRhdGFGcmFtZSxcbiAgICBsZWFmQ29sTmFtZTogc3RyaW5nLCBjbHVzdGVyQ29sTmFtZTogc3RyaW5nLCBuYT86IGFueSk6IHZvaWQ7XG59XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBnZXRUcmVlSGVscGVyKCk6IFByb21pc2U8SVRyZWVIZWxwZXI+IHtcbiAgY29uc3QgZnVuY0xpc3QgPSBERy5GdW5jLmZpbmQoe3BhY2thZ2U6ICdQaHlsb1RyZWVWaWV3ZXInLCBuYW1lOiAnZ2V0VHJlZUhlbHBlcid9KTtcbiAgaWYgKGZ1bmNMaXN0Lmxlbmd0aCA9PT0gMClcbiAgICB0aHJvdyBuZXcgRXJyb3IoJ1BhY2thZ2UgXCJQaHlsb1RyZWVWaWV3ZXJcIlwiIG11c3QgYmUgaW5zdGFsbGVkIGZvciBUcmVlSGVscGVyLicpO1xuXG4gIGNvbnN0IHJlczogSVRyZWVIZWxwZXIgPSAoYXdhaXQgZnVuY0xpc3RbMF0ucHJlcGFyZSgpLmNhbGwoKSkuZ2V0T3V0cHV0UGFyYW1WYWx1ZSgpIGFzIElUcmVlSGVscGVyO1xuICByZXR1cm4gcmVzO1xufSJdfQ==