Ver Fonte

console.log removed

Pavel Zhigalov há 1 mês atrás
pai
commit
30ce48ef0d

+ 1 - 3
src/v1/graph/Graph.ts

@@ -48,10 +48,8 @@ export default class Graph<TNode extends Node, TEdge extends Edge<TNode>> {
 	public get isAcyclic() : boolean {
 		const cache = this._cache.isAcyclic;
 
-		if(cache !== undefined) {
-			console.log('from cache')
+		if(cache !== undefined)
 			return cache;
-		}
 
 		const queue: TNode["id"][] = [];
 		const nodeToInDegree = new Map<TNode["id"], number>();

+ 0 - 30
src/v1/io/serialize/dzwf/JointJsonSerializer.ts

@@ -1,30 +0,0 @@
-import { writeFileSync } from "node:fs";
-import Edge from "../../../graph/edge/Edge.js";
-import Graph from "../../../graph/Graph.js";
-import Node from "../../../graph/node/Node.js";
-import Serializer from "../Serializer.js";
-import { DZWFData } from "../../dzwf/DZWFData.js";
-
-export default class DZWFJsonSerializer implements Serializer<Graph<Node, Edge<Node>>, void> {
-	private readonly _dzwfData: DZWFData & unknown;
-	private readonly _dzwfFileName: string;
-	
-	public constructor(dzwfData: DZWFData & unknown, dzwfFileName: string = "result.dzwf") {
-		this._dzwfData = dzwfData;
-		this._dzwfFileName = dzwfFileName;
-	}
-
-	serialize(data: Graph<Node, Edge<Node>>): void {
-		this._dzwfData.elements.forEach((element) => {
-			const { id } = element;
-
-			const node = data.getNode(id);
-			if(!node)
-				return;
-
-			element.diagram.position = { x: node.x, y: node.y };
-		});
-
-		writeFileSync(this._dzwfFileName, JSON.stringify(this._dzwfData));
-	}
-}

+ 1 - 0
src/v1/optimizer/siguiyama/CoordinateAssignmentStep.ts

@@ -29,6 +29,7 @@ export default class CoordinateAssignmentStep extends AlgorithmStep<SiguiyamaCon
 		this.reverseEdgesInFeedback(graph, feedbackSet);
 
 		const grid = this.buildGrid(layering);
+		
 		this.assignCoordinatesFromGrid(graph, grid);
 	}
 

+ 0 - 1
src/v1/optimizer/siguiyama/CycleRemoveStep.ts

@@ -19,7 +19,6 @@ export default class CycleRemoveStep extends AlgorithmStep<SiguiyamaContext> {
 			throw new CycleRemoveStepError("Graph not found!");
 
 		const feedbackSet = this.removeCycles(graph);
-		console.log(feedbackSet);
 
 		context.feedbackSet = feedbackSet;
 	}

+ 5 - 2
src/v1/optimizer/siguiyama/LayerAssignmentStep.ts

@@ -23,11 +23,9 @@ export default class LayerAssignmentStep extends AlgorithmStep<SiguiyamaContext>
 		if(!feedbackSet)
 			throw new LayerAssignmentStepError("Feedback set is undefined!");
 
-		console.log(graph)
 		const layering = this.longestPathAlgorithm(graph);
 
 		this.subdivideLongEdges(graph, layering, feedbackSet);
-		console.log(graph)
 
 		context.layering = layering;
 	}
@@ -109,10 +107,15 @@ export default class LayerAssignmentStep extends AlgorithmStep<SiguiyamaContext>
 
 			graph.addEdge(newEdge);
 
+			if(isReversed)
+				feedbackSet.push(newEdge.id);
+
 			previousNodeId = node.id;
 		}
 
 		const lastEdge = new Edge(previousNodeId, edge.to, `${edge.id}_segment_${span}`);
 		graph.addEdge(lastEdge);
+		if(isReversed)
+			feedbackSet.push(lastEdge.id);
 	}
 }

+ 0 - 1
src/v1/optimizer/siguiyama/NodeOrderingStep.ts

@@ -23,7 +23,6 @@ export default class NodeOrderingStep extends AlgorithmStep<SiguiyamaContext> {
 			throw new NodeOrderingStepError("Layering of graph was not found!");
 
 		this.barycenter(graph, layering);
-		console.log(layering.getLayers().map((l) => l.nodes));
 	}
 
 	private barycenter(graph: Graph<Node, Edge<Node>>, layering: Layering<Node, Edge<Node>>) : void {