Issue #74: Add topological sort to read unordered dimensions

Adiciona uma classe que realiza ordenação topológica. No parsing do arquivo de configuração é criada uma relação de dependencia entre as dimensões (subdimensões dependem de seus pais) e então a ordenação topológica é realizada.

Signed-off-by: Lucas Fernandes de Oliveira lfoliveira@inf.ufpr.br

src/util/configParser.ts

@@ -26,6 +26,7 @@ import { RelationType } from "../common/types";
 import { Filter } from "../core/filter";
 import { Clause } from "../core/clause";
 import { Source, SourceOptions} from "../core/source";
+import { Tsort, TsortDep } from "./tsort";
 import * as fs from "fs";
 import * as yaml from "js-yaml";
 
@@ -84,6 +85,10 @@ interface DimensionMap {
     [key: string]: Dimension;
 }
 
+interface DimensionOptsMap {
+    [key: string]: DimensionStrOptions;
+}
+
 interface MetricMap {
     [key: string]: Metric;
 }
@@ -140,6 +145,7 @@ export class ConfigParser {
         let dimMap: DimensionMap = {};
         let enumMap: EnumTypeMap = {};
         let sourcMap: SourceMap = {};
+        let dimOptsMap: DimensionOptsMap = {};
 
         for (let i = 0; i < metricsOpts.length; ++i) {
             let met = new Metric(this.parseMetOpts(metricsOpts[i]));
@@ -152,6 +158,30 @@ export class ConfigParser {
             enumMap[enumT.name] = enumT;
         }
 
+        let toSort: TsortDep[] = [];
+        for (let i = 0; i < dimensionsOpts.length; ++i) {
+            if (dimensionsOpts[i].parent) {
+                toSort.push({
+                    value: dimensionsOpts[i].name,
+                    dependOf: dimensionsOpts[i].parent
+                });
+            }
+
+            else {
+                toSort.push({
+                    value: dimensionsOpts[i].name
+                });
+            }
+
+            dimOptsMap[dimensionsOpts[i].name] = dimensionsOpts[i];
+        }
+
+        dimensionsOpts = Tsort.dependencies(toSort).filter((name) => {
+            return (dimOptsMap[name]) ? true : false;
+        }).map((name) => {
+            return dimOptsMap[name];
+        });
+
         for (let i = 0; i < dimensionsOpts.length; ++i) {
             let dim = new Dimension(this.parseDimOpts(dimensionsOpts[i], parsed.dimensions));
             parsed.dimensions.push(dim);