2 Commits 625fb225bc ... ec3cdfe981

Author SHA1 Message Date
  Pavel Zhigalov ec3cdfe981 ok 1 month ago
  Pavel Zhigalov 625fb225bc ok 1 month ago
38 changed files with 6 additions and 28 deletions
  1. 0 0
      src/errors/BPMNError.ts
  2. 0 0
      src/errors/DeserializerError.ts
  3. 0 0
      src/errors/SerializerError.ts
  4. 0 0
      src/errors/graph/GraphError.ts
  5. 0 0
      src/errors/graph/layering/LayeringError.ts
  6. 0 0
      src/errors/optimizer/CleanupStepError.ts
  7. 0 0
      src/errors/optimizer/CycleRemoveStepError.ts
  8. 0 0
      src/errors/optimizer/EdgeRoutingStepError.ts
  9. 0 0
      src/errors/optimizer/LayerAssignmentStepError.ts
  10. 0 0
      src/errors/optimizer/NodeOrderingStepError.ts
  11. 0 0
      src/errors/optimizer/OptimizerError.ts
  12. 0 0
      src/graph/Graph.ts
  13. 0 0
      src/graph/edge/DummyEdge.ts
  14. 0 0
      src/graph/edge/Edge.ts
  15. 0 0
      src/graph/layering/Layer.ts
  16. 0 0
      src/graph/layering/Layering.ts
  17. 0 0
      src/graph/node/DummyNode.ts
  18. 0 0
      src/graph/node/Node.ts
  19. 6 28
      src/index.ts
  20. 0 0
      src/io/deserialize/Deserializer.ts
  21. 0 0
      src/io/deserialize/json/DefaultJsonDeserializer.ts
  22. 0 0
      src/io/deserialize/json/DzwfJsonDeserializer.ts
  23. 0 0
      src/io/deserialize/json/JsonDeserializer.ts
  24. 0 0
      src/io/dzwf/DzwfData.ts
  25. 0 0
      src/io/serialize/Serializer.ts
  26. 0 0
      src/io/serialize/json/DefaultJsonSerializer.ts
  27. 0 0
      src/io/serialize/json/DzwfJsonSerializer.ts
  28. 0 0
      src/io/serialize/json/JsonSerializer.ts
  29. 0 0
      src/observable/Observable.ts
  30. 0 0
      src/optimizer/AlgorithmContext.ts
  31. 0 0
      src/optimizer/AlgorithmStep.ts
  32. 0 0
      src/optimizer/siguiyama/SiguiyamaAlgorithm.ts
  33. 0 0
      src/optimizer/siguiyama/SiguiyamaContext.ts
  34. 0 0
      src/optimizer/steps/CoordinateAssignmentStep.ts
  35. 0 0
      src/optimizer/steps/CycleRemoveStep.ts
  36. 0 0
      src/optimizer/steps/EdgeRoutingStep.ts
  37. 0 0
      src/optimizer/steps/LayerAssignmentStep.ts
  38. 0 0
      src/optimizer/steps/NodeOrderingStep.ts

+ 0 - 0
src/v1/errors/BPMNError.ts → src/errors/BPMNError.ts


+ 0 - 0
src/v1/errors/DeserializerError.ts → src/errors/DeserializerError.ts


+ 0 - 0
src/v1/errors/SerializerError.ts → src/errors/SerializerError.ts


+ 0 - 0
src/v1/errors/graph/GraphError.ts → src/errors/graph/GraphError.ts


+ 0 - 0
src/v1/errors/graph/layering/LayeringError.ts → src/errors/graph/layering/LayeringError.ts


+ 0 - 0
src/v1/errors/optimizer/CleanupStepError.ts → src/errors/optimizer/CleanupStepError.ts


+ 0 - 0
src/v1/errors/optimizer/CycleRemoveStepError.ts → src/errors/optimizer/CycleRemoveStepError.ts


+ 0 - 0
src/v1/errors/optimizer/EdgeRoutingStepError.ts → src/errors/optimizer/EdgeRoutingStepError.ts


+ 0 - 0
src/v1/errors/optimizer/LayerAssignmentStepError.ts → src/errors/optimizer/LayerAssignmentStepError.ts


+ 0 - 0
src/v1/errors/optimizer/NodeOrderingStepError.ts → src/errors/optimizer/NodeOrderingStepError.ts


+ 0 - 0
src/v1/errors/optimizer/OptimizerError.ts → src/errors/optimizer/OptimizerError.ts


+ 0 - 0
src/v1/graph/Graph.ts → src/graph/Graph.ts


+ 0 - 0
src/v1/graph/edge/DummyEdge.ts → src/graph/edge/DummyEdge.ts


+ 0 - 0
src/v1/graph/edge/Edge.ts → src/graph/edge/Edge.ts


+ 0 - 0
src/v1/graph/layering/Layer.ts → src/graph/layering/Layer.ts


+ 0 - 0
src/v1/graph/layering/Layering.ts → src/graph/layering/Layering.ts


+ 0 - 0
src/v1/graph/node/DummyNode.ts → src/graph/node/DummyNode.ts


+ 0 - 0
src/v1/graph/node/Node.ts → src/graph/node/Node.ts


+ 6 - 28
src/index.ts

@@ -1,17 +1,9 @@
-import { readFileSync, writeFileSync } from "node:fs";
-import BPMNError from "./v1/errors/BPMNError.js";
-import Edge from "./v1/graph/edge/Edge.js";
-import Graph from "./v1/graph/Graph.js";
-import Node from "./v1/graph/node/Node.js";
-import CoordinateAssignmentStep from "./v1/optimizer/steps/CoordinateAssignmentStep.js";
-import CycleRemoveStep from "./v1/optimizer/steps/CycleRemoveStep.js";
-import LayerAssignmentStep from "./v1/optimizer/steps/LayerAssignmentStep.js";
-import NodeOrderingStep from "./v1/optimizer/steps/NodeOrderingStep.js";
-import SiguiyamaAlgorithm from "./v1/optimizer/siguiyama/SiguiyamaAlgorithm.js";
-import { SiguiyamaContext } from "./v1/optimizer/siguiyama/SiguiyamaContext.js";
-import DzwfJsonDeserializer from "./v1/io/deserialize/json/DzwfJsonDeserializer.js";
-import DzwfJsonSerializer from "./v1/io/serialize/json/DzwfJsonSerializer.js";
-import EdgeRoutingStep from "./v1/optimizer/steps/EdgeRoutingStep.js";
+import SiguiyamaAlgorithm from "./optimizer/siguiyama/SiguiyamaAlgorithm.js";
+import Graph from "./graph/Graph.js";
+import Node from "./graph/node/Node.js";
+import Edge from "./graph/edge/Edge.js";
+import BPMNError from "./errors/BPMNError.js";
+import {SiguiyamaContext} from "./optimizer/siguiyama/SiguiyamaContext.js";
 
 export class BPMNOptimizer {
 	private _optimizationAlgorithm?: SiguiyamaAlgorithm;
@@ -27,17 +19,3 @@ export class BPMNOptimizer {
 		return this._optimizationAlgorithm.run(graph);
 	}
 }
-
-const algorithm = new SiguiyamaAlgorithm()
-	.addStep(new CycleRemoveStep())
-	.addStep(new LayerAssignmentStep())
-	.addStep(new NodeOrderingStep())
-	.addStep(new CoordinateAssignmentStep(60, 100))
-	.addStep(new EdgeRoutingStep());
-const optimizer = new BPMNOptimizer().setOptimizationAlgorithm(algorithm);
-
-const data = readFileSync("./data/bpmn-graph.json").toString();
-const { dzwfData, graph } = new DzwfJsonDeserializer().deserialize(data);
-const result = optimizer.run(graph);
-
-writeFileSync(`./data/document.dzwf`, new DzwfJsonSerializer().serialize({ dzwfData, graph: result.graph }));

+ 0 - 0
src/v1/io/deserialize/Deserializer.ts → src/io/deserialize/Deserializer.ts


+ 0 - 0
src/v1/io/deserialize/json/DefaultJsonDeserializer.ts → src/io/deserialize/json/DefaultJsonDeserializer.ts


+ 0 - 0
src/v1/io/deserialize/json/DzwfJsonDeserializer.ts → src/io/deserialize/json/DzwfJsonDeserializer.ts


+ 0 - 0
src/v1/io/deserialize/json/JsonDeserializer.ts → src/io/deserialize/json/JsonDeserializer.ts


+ 0 - 0
src/v1/io/dzwf/DzwfData.ts → src/io/dzwf/DzwfData.ts


+ 0 - 0
src/v1/io/serialize/Serializer.ts → src/io/serialize/Serializer.ts


+ 0 - 0
src/v1/io/serialize/json/DefaultJsonSerializer.ts → src/io/serialize/json/DefaultJsonSerializer.ts


+ 0 - 0
src/v1/io/serialize/json/DzwfJsonSerializer.ts → src/io/serialize/json/DzwfJsonSerializer.ts


+ 0 - 0
src/v1/io/serialize/json/JsonSerializer.ts → src/io/serialize/json/JsonSerializer.ts


+ 0 - 0
src/v1/observable/Observable.ts → src/observable/Observable.ts


+ 0 - 0
src/v1/optimizer/AlgorithmContext.ts → src/optimizer/AlgorithmContext.ts


+ 0 - 0
src/v1/optimizer/AlgorithmStep.ts → src/optimizer/AlgorithmStep.ts


+ 0 - 0
src/v1/optimizer/siguiyama/SiguiyamaAlgorithm.ts → src/optimizer/siguiyama/SiguiyamaAlgorithm.ts


+ 0 - 0
src/v1/optimizer/siguiyama/SiguiyamaContext.ts → src/optimizer/siguiyama/SiguiyamaContext.ts


+ 0 - 0
src/v1/optimizer/steps/CoordinateAssignmentStep.ts → src/optimizer/steps/CoordinateAssignmentStep.ts


+ 0 - 0
src/v1/optimizer/steps/CycleRemoveStep.ts → src/optimizer/steps/CycleRemoveStep.ts


+ 0 - 0
src/v1/optimizer/steps/EdgeRoutingStep.ts → src/optimizer/steps/EdgeRoutingStep.ts


+ 0 - 0
src/v1/optimizer/steps/LayerAssignmentStep.ts → src/optimizer/steps/LayerAssignmentStep.ts


+ 0 - 0
src/v1/optimizer/steps/NodeOrderingStep.ts → src/optimizer/steps/NodeOrderingStep.ts