Unify code for RawDataTable and InvertedRawDataTable, selections will…

… added as new column Caleydo/targid2#255
Caleydo · Oct 12, 2016 · 70120a2 · 70120a2
1 parent 42efa16
commit 70120a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/ExpressionScore.ts b/ExpressionScore.ts
@@ -20,17 +20,11 @@ class ExpressionScore implements IScore<number> {
       domain: this.score === 'ab_int' ? [0, 100] : [-1, 1]
     };
   }
-  compute(ids: ranges.Range, idtype: idtypes.IDType, idMapper:(id:string) => number): Promise<{ [id:string]: number }> {
+  compute(ids: ranges.Range, idtype: idtypes.IDType): Promise<any[]> {
     return ajax.getAPIJSON('/targid/db/dummy/expression_score', {
       score: this.score,
       b_cat2 : this.tumor_sample,
       agg: this.aggregation
-    }).then((rows: any[]) => {
-      const r : { [id:string]: number } = {};
-      rows.forEach((row) => {
-        r[idMapper(row.id)] = row.score;
-      });
-      return r;
     });
   }
 }

diff --git a/Scores.ts b/Scores.ts
@@ -20,14 +20,8 @@ class AvgScore implements IScore<number> {
       domain: [0, 100]
     };
   }
-  compute(ids: ranges.Range, idtype: idtypes.IDType, idMapper:(id:string) => number): Promise<{ [id:string]: number }> {
-    return ajax.getAPIJSON('/targid/db/dummy/avg_score').then((rows: any[]) => {
-      const r : { [id:string]: number } = {};
-      rows.forEach((row) => {
-        r[idMapper(row.id)] = row.score;
-      });
-      return r;
-    });
+  compute(ids: ranges.Range, idtype: idtypes.IDType): Promise<any[]> {
+    return ajax.getAPIJSON('/targid/db/dummy/avg_score');
   }
 }