Skip to content
Snippets Groups Projects
Commit e7a00f77 authored by Jürgen Walter's avatar Jürgen Walter
Browse files

name fixes II

parent 1122c746
No related branches found
No related tags found
No related merge requests found
...@@ -242,7 +242,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs ...@@ -242,7 +242,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs
.getVertices()) { .getVertices()) {
AssemblyComponent component = node.getEntity() AssemblyComponent component = node.getEntity()
.getAllocationComponent().getAssemblyComponent(); .getAllocationComponent().getAssemblyComponent();
String componentName = ModelBuilder.applyComponentNameFix(component.getType().getTypeName()); String componentName = ModelBuilder.applyNameFixes(component.getType().getTypeName());
String hostName = node.getEntity().getAllocationComponent() String hostName = node.getEntity().getAllocationComponent()
.getExecutionContainer().getName(); .getExecutionContainer().getName();
// Teerat Pitakrat: TODO add allocation information to assembly // Teerat Pitakrat: TODO add allocation information to assembly
...@@ -268,7 +268,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs ...@@ -268,7 +268,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs
for (WeightedBidirectionalDependencyGraphEdge<AllocationComponentOperationPair> outgoingEdge : node for (WeightedBidirectionalDependencyGraphEdge<AllocationComponentOperationPair> outgoingEdge : node
.getOutgoingEdges()) { .getOutgoingEdges()) {
helpMehtod(builder, componentName, hostName, numIncomingCalls, helperMethod(builder, componentName, hostName, numIncomingCalls,
externalCalls, outgoingEdge); externalCalls, outgoingEdge);
} }
...@@ -281,6 +281,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs ...@@ -281,6 +281,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs
log.info("\t\tresource demand has been set to 0.0"); log.info("\t\tresource demand has been set to 0.0");
meanResourceDemand = 0.0; meanResourceDemand = 0.0;
} }
log.info("Try to create behavior description for" + componentName + method.getSignature().getName());
builder.addSEFF(componentName, method.getSignature().getName(), builder.addSEFF(componentName, method.getSignature().getName(),
externalCalls, hostName, meanResourceDemand); externalCalls, hostName, meanResourceDemand);
} }
...@@ -315,7 +316,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs ...@@ -315,7 +316,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs
} }
private static void helpMehtod( private static void helperMethod(
IModelBuilder builder, IModelBuilder builder,
String componentName, String componentName,
String hostName, String hostName,
...@@ -324,7 +325,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs ...@@ -324,7 +325,7 @@ public class PerformanceModelFilter extends AbstractFilterPlugin{ //extends Abs
WeightedBidirectionalDependencyGraphEdge<AllocationComponentOperationPair> outgoingEdge) { WeightedBidirectionalDependencyGraphEdge<AllocationComponentOperationPair> outgoingEdge) {
AllocationComponentOperationPair targetNode = outgoingEdge.getTarget() AllocationComponentOperationPair targetNode = outgoingEdge.getTarget()
.getEntity(); .getEntity();
String targetComponentName = ModelBuilder.applyComponentNameFix(targetNode.getAllocationComponent() String targetComponentName = ModelBuilder.applyNameFixes(targetNode.getAllocationComponent()
.getAssemblyComponent().getType().getTypeName()); .getAssemblyComponent().getType().getTypeName());
String calledMethodName = targetNode.getOperation().getSignature() String calledMethodName = targetNode.getOperation().getSignature()
.getName(); .getName();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment