From 89d436aaedd1a855c0c712a75bfafcc3121aaa0e Mon Sep 17 00:00:00 2001
From: rafaelatc3sl <rpd17@c3sl>
Date: Wed, 9 Jan 2019 10:13:00 -0200
Subject: [PATCH] Issue #94: Update view join algorithm
Signed-off-by: rafaelatc3sl <rpd17@c3sl>
---
src/util/viewHandler.ts | 56 +++++++++++------------------------------
1 file changed, 15 insertions(+), 41 deletions(-)
diff --git a/src/util/viewHandler.ts b/src/util/viewHandler.ts
index ced3027c..fdd78202 100644
--- a/src/util/viewHandler.ts
+++ b/src/util/viewHandler.ts
@@ -309,60 +309,34 @@ export class ViewHandler {
}
/**
- * Finds the pair of views most realted in a set of views and
- * applies the JOIN operation in this set.
- * Returns a set with the joined view and without the most
- * related view.
+ * Assemble a set of views and applies
+ * JOIN operation in this set.
+ * Returns a set with the joined view.
* @param v - Set of candidated views to be joined.
*/
private static applyJoin(v: View[]): View[] {
- /*
- At this point 2 views will be joined, first the
- similarity with each pair of views is calculated,
- the pair with the biggedt similarity will be joined.
-
- Similarity is calculated with the number of common
- dimensions in the keys.
- */
+
const views = v.map((i) => i);
- let similarity = 0;
- let idx0 = 0;
- let idx1 = 1;
- for (let i = 0; i < views.length; ++i) {
- for (let j = i + 1 ; j < views.length; ++j) {
- const pi = views[i].dimensions;
- const pj = views[j].dimensions;
- let score = this.similarDimensions (pi, pj);
- if (similarity < score) {
- similarity = score;
- idx0 = i;
- idx1 = j;
- }
- }
- }
- const partial0 = views[idx0];
- const partial1 = views[idx1];
+ let dims: Dimension[] = [];
+ let mets: Metric[] = [];
+ let clauses: Clause[] = [];
- views.splice(idx1, 1);
- views.splice(idx0, 1);
+ for (let i = 0; i < views.length; ++i) {
+ mets = mets.concat(views[i].metrics);
+ dims = dims.concat(views[i].dimensions);
+ clauses = clauses.concat(views[i].clauses);
+ }
- let dims = partial0.dimensions.concat(partial1.dimensions);
dims = ViewHandler.removeDuplicatedDimensions(dims);
-
- let mets = partial0.metrics.concat(partial1.metrics);
mets = ViewHandler.removeDuplicatedMetrics(mets);
-
- let clauses = partial0.clauses.concat(partial1.clauses);
clauses = ViewHandler.removeDuplicatedClauses(clauses);
const qOpts: QueryOpts = {metrics: mets, dimensions: dims, clauses: clauses};
+ const partialQuery = new Query(qOpts);
- const partialQuery = new Query(qOpts);
-
- const partial = ViewHandler.queryJoin(partialQuery, [partial0, partial1]);
- views.push(partial);
- return views;
+ const partial = ViewHandler.queryJoin(partialQuery, views);
+ return [partial];
}
/**
--
GitLab