diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/PerformanceModelCreator.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/PerformanceModelCreator.java index c213cdb55a65c893107e2dcd640e09e32ea7d8bb..5561791914b576c028bfb6eedb43cbfa2ae2e687 100644 --- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/PerformanceModelCreator.java +++ b/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/PerformanceModelCreator.java @@ -42,7 +42,7 @@ import tools.descartes.pmx.builder.IModelBuilder; public class PerformanceModelCreator { private static final Logger log = Logger.getLogger(PerformanceModelCreator.class); - + // public static void createPerformanceModel(SystemModelRepository // systemModel, IModelBuilder builder) { // createExecutionContainers(systemModel, builder); @@ -51,32 +51,30 @@ public class PerformanceModelCreator { // addComponentsToAssemblies(systemModel, builder); // createAllocations(systemModel, builder); // } - - public static void addComponentsToAssemblies( - SystemModelRepository systemModel, IModelBuilder builder) { - final Collection<AssemblyComponent> assemblyComponents = systemModel - .getAssemblyFactory().getAssemblyComponentInstances(); + + public static void addComponentsToAssemblies(SystemModelRepository systemModel, IModelBuilder builder) { + final Collection<AssemblyComponent> assemblyComponents = systemModel.getAssemblyFactory() + .getAssemblyComponentInstances(); for (AssemblyComponent assembly : assemblyComponents) { String assemblyName = assembly.getType().getTypeName(); - if(assemblyName != "'Entry'"){ + if (assemblyName != "'Entry'") { builder.addComponentToAssembly(assemblyName, assemblyName); } } } public static void createAllocations(SystemModelRepository systemModel, IModelBuilder builder) { - Collection<AllocationComponent> allocationComponents = systemModel - .getAllocationFactory().getAllocationComponentInstances(); + Collection<AllocationComponent> allocationComponents = systemModel.getAllocationFactory() + .getAllocationComponentInstances(); for (AllocationComponent allocationComponent : allocationComponents) { - builder.addAllocationContext(allocationComponent - .getAssemblyComponent().getType().getTypeName(), allocationComponent - .getExecutionContainer().getName()); + builder.addAllocationContext(allocationComponent.getAssemblyComponent().getType().getTypeName(), + allocationComponent.getExecutionContainer().getName()); } } public static void createAssemblies(SystemModelRepository systemModel, IModelBuilder builder) { - final Collection<AssemblyComponent> assemblyComponents = systemModel - .getAssemblyFactory().getAssemblyComponentInstances(); + final Collection<AssemblyComponent> assemblyComponents = systemModel.getAssemblyFactory() + .getAssemblyComponentInstances(); for (AssemblyComponent assembly : assemblyComponents) { String assemblyName = assembly.getType().getTypeName(); builder.addAssembly(assemblyName); @@ -84,27 +82,26 @@ public class PerformanceModelCreator { } public static void createComponentsAndInterfaces(SystemModelRepository systemModel, IModelBuilder builder) { - final Collection<ComponentType> componentTypes = systemModel - .getTypeRepositoryFactory().getComponentTypes(); + final Collection<ComponentType> componentTypes = systemModel.getTypeRepositoryFactory().getComponentTypes(); for (final ComponentType type : componentTypes) { - builder.addComponent(type.getTypeName()); - builder.addInterface("I"+type.getTypeName()); + builder.addComponent(type.getTypeName()); + builder.addInterface("I" + type.getTypeName()); for (Operation opertation : type.getOperations()) { Signature signature = opertation.getSignature(); builder.addMethod(type, signature); } } } - + public static void createExecutionContainers(SystemModelRepository systemModel, IModelBuilder builder, HashMap<String, Integer> numCores) { - final Collection<ExecutionContainer> executionContainers = systemModel - .getExecutionEnvironmentFactory().getExecutionContainers(); + final Collection<ExecutionContainer> executionContainers = systemModel.getExecutionEnvironmentFactory() + .getExecutionContainers(); for (ExecutionContainer container : executionContainers) { - int numberOfCores =0; - try{ + int numberOfCores = 0; + try { numberOfCores = numCores.get(container.getName()); - }catch (Exception e) { + } catch (Exception e) { log.error("could not find number of cores for " + container.getName()); log.info("assumed numberOfCores = 2"); numberOfCores = 2;