From a333395881c548a49b713b9a50c32f92a7eb88c6 Mon Sep 17 00:00:00 2001
From: Lee <irina.lee@etu.upmc.fr>
Date: Sat, 14 Jul 2018 17:08:52 +0200
Subject: [PATCH] fixed cluster translator problem (syscam)
---
src/main/java/syscamstranslator/SysCAMSSpecification.java | 5 ++++-
.../java/syscamstranslator/toSysCAMS/TopCellGenerator.java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/syscamstranslator/SysCAMSSpecification.java b/src/main/java/syscamstranslator/SysCAMSSpecification.java
index fcc5b90f46..32e7efae71 100644
--- a/src/main/java/syscamstranslator/SysCAMSSpecification.java
+++ b/src/main/java/syscamstranslator/SysCAMSSpecification.java
@@ -126,11 +126,14 @@ public class SysCAMSSpecification{
return portsDE;
}
- public LinkedList<SysCAMSTConnector> getAllConnector(){
+ public LinkedList<SysCAMSTConnector> getAllConnectorCluster(){
LinkedList<SysCAMSTConnector> cons = new LinkedList<SysCAMSTConnector>();
for (SysCAMSTConnector con : connectors) {
if (con instanceof SysCAMSTConnector) {
+ if (!((con.get_p1().getComponent() instanceof SysCAMSTPortConverter && con.get_p2().getComponent() instanceof SysCAMSTPortDE)
+ || (con.get_p2().getComponent() instanceof SysCAMSTPortConverter && con.get_p1().getComponent() instanceof SysCAMSTPortDE))) {
cons.add(con);
+ }
}
}
return cons;
diff --git a/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java b/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
index 381d6f5fbc..d71ffee1b3 100644
--- a/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
+++ b/src/main/java/syscamstranslator/toSysCAMS/TopCellGenerator.java
@@ -97,7 +97,7 @@ public class TopCellGenerator {
public void saveFile(String path) {
LinkedList<SysCAMSTCluster> clusters = TopCellGenerator.syscams.getAllCluster();
- LinkedList<SysCAMSTConnector> connectors = TopCellGenerator.syscams.getAllConnector();
+ LinkedList<SysCAMSTConnector> connectors = TopCellGenerator.syscams.getAllConnectorCluster();
String top, makefile;
--
GitLab