Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Converter fix #2

Merged
merged 4 commits into from
Jun 12, 2024
Merged

Converter fix #2

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92680a9
Remove erroneous project File
01Parzival10 Jun 12, 2024
ffd0695
Remove auto created project file
01Parzival10 Jun 12, 2024
c971b2e
Fixing edgeless Nodes issue
01Parzival10 Jun 12, 2024
cc465ae
Remove debugging variable
01Parzival10 Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/PCMConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public static String computeCompleteName(AbstractPCMVertex<?> vertex) {
private DataFlowDiagramAndDictionary processPalladio(FlowGraphCollection flowGraphCollection) {
for (AbstractTransposeFlowGraph transposeFlowGraph : flowGraphCollection.getTransposeFlowGraphs()) {
Node previousNode = null;
for (AbstractVertex<?> abstractVertex : transposeFlowGraph.getVertices()) {
for (AbstractVertex<?> abstractVertex : transposeFlowGraph.getVertices()) {
if (abstractVertex instanceof AbstractPCMVertex) {
previousNode = processAbstractPCMVertex((AbstractPCMVertex<?>) abstractVertex, previousNode);
}
Expand All @@ -181,6 +181,7 @@ private void createFlowBetweenPreviousAndCurrentNode(Node source, Node dest, Abs
return;
}
List<DataCharacteristic> dataCharacteristics = pcmVertex.getAllDataCharacteristics();
if (dataCharacteristics.size() == 0) dataFlowDiagram.getFlows().add(createFlow(source, dest, ""));
for (DataCharacteristic dataCharacteristic : dataCharacteristics) {
String flowName = dataCharacteristic.variableName();

Expand Down
11 changes: 0 additions & 11 deletions tests/.classpath
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions tests/.project
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ...rg.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ private void testSpecificModel(String inputModel, String inputFile, String model
if (complete == null) {
complete = new PCMConverter().pcmToDFD(modelLocation, usageModelPath, allocationPath, nodeCharPath, Activator.class);
}

final DataFlowDiagram test = complete.dataFlowDiagram();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whatfor do you need this test variable?



if (webTarget != null) {
var dfdConverter = new DataFlowDiagramConverter();
Expand Down Expand Up @@ -125,6 +128,7 @@ private void testSpecificModel(String inputModel, String inputFile, String model
for (AbstractTransposeFlowGraph as : flowGraph.getTransposeFlowGraphs()) {
for (AbstractVertex<?> ase : as.getVertices()) {
List<DataCharacteristic> variables = ase.getAllDataCharacteristics();
if (variables.isEmpty() && !ase.getPreviousElements().isEmpty()) flowNames.add("");
for (DataCharacteristic variable : variables) {
flowNames.add(variable.variableName());
}
Expand Down
Loading