From 8a7ec99b6d53860d5cb5f3094c64da2d80ac83d2 Mon Sep 17 00:00:00 2001 From: Chrissi <christopher@hbsc-werner.de> Date: Thu, 18 Jul 2019 14:14:24 +0200 Subject: [PATCH] fix some namings in sync --- .../main/scala/ttc2019/CompleteTTCProcess.scala | 1 + .../worksync/SyncChangesTruthTableSync.scala | 16 ---------------- .../ttc2019/worksync/SyncHeadNamesSync.scala | 2 +- .../worksync/SyncInputPortNamesSync.scala | 2 +- .../worksync/SyncOutputPortNamesSync.scala | 2 +- .../ttc2019/worksync/SyncPortNamesSync.scala | 2 +- 6 files changed, 5 insertions(+), 20 deletions(-) diff --git a/solutions/RSync/src/main/scala/ttc2019/CompleteTTCProcess.scala b/solutions/RSync/src/main/scala/ttc2019/CompleteTTCProcess.scala index 8274c61..7d99c74 100644 --- a/solutions/RSync/src/main/scala/ttc2019/CompleteTTCProcess.scala +++ b/solutions/RSync/src/main/scala/ttc2019/CompleteTTCProcess.scala @@ -39,6 +39,7 @@ object CompleteTTCProcess extends App { ctts = new CreateTruthTableSync() if (sync) { SynchronizationCompartment.changeConstructionRule(TTandBDTandBDDSyncConstruction) + SynchronizationCompartment.addSynchronizationRule(new SyncHeadNamesSync) SynchronizationCompartment.addSynchronizationRule(new SyncPortNamesSync) SynchronizationCompartment.addSynchronizationRule(new SyncChangesTruthTableSync) SynchronizationCompartment.addSynchronizationRule(new SyncChangesCellSync) diff --git a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncChangesTruthTableSync.scala b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncChangesTruthTableSync.scala index 6b15b60..896c7cc 100644 --- a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncChangesTruthTableSync.scala +++ b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncChangesTruthTableSync.scala @@ -519,22 +519,6 @@ class SyncChangesTruthTableSync() extends ISyncCompartment { } } }*/ - - /** - * Change the names of TruthTable and BDDs. - */ - def changeName(): Unit = { - if (!doSync) { - doSync = true; - var name: String = +this getName (); - getSyncer().foreach { a => - if (!a.equals(this)) { - (+a).setName(name); - } - } - doSync = false; - } - } } } \ No newline at end of file diff --git a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncHeadNamesSync.scala b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncHeadNamesSync.scala index c3f5e7a..a6812e9 100644 --- a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncHeadNamesSync.scala +++ b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncHeadNamesSync.scala @@ -40,7 +40,7 @@ class SyncHeadNamesSync() extends ISyncCompartment { def getOuterCompartment(): ISyncCompartment = SyncHeadNamesSync.this - def changeName(): Unit = { + def syncSetName(): Unit = { if (!doSync) { doSync = true; var name: String = +this getName(); diff --git a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncInputPortNamesSync.scala b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncInputPortNamesSync.scala index 677e47b..ccc04f1 100644 --- a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncInputPortNamesSync.scala +++ b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncInputPortNamesSync.scala @@ -40,7 +40,7 @@ class SyncInputPortNamesSync() extends ISyncCompartment { def getOuterCompartment(): ISyncCompartment = SyncInputPortNamesSync.this - def changeName(): Unit = { + def syncSetName(): Unit = { if (!doSync) { doSync = true; var name: String = +this getName(); diff --git a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncOutputPortNamesSync.scala b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncOutputPortNamesSync.scala index 3a67d3d..2723c6d 100644 --- a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncOutputPortNamesSync.scala +++ b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncOutputPortNamesSync.scala @@ -40,7 +40,7 @@ class SyncOutputPortNamesSync() extends ISyncCompartment { def getOuterCompartment(): ISyncCompartment = SyncOutputPortNamesSync.this - def changeName(): Unit = { + def syncSetName(): Unit = { if (!doSync) { doSync = true; var name: String = +this getName(); diff --git a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncPortNamesSync.scala b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncPortNamesSync.scala index ff789f8..6599721 100644 --- a/solutions/RSync/src/main/scala/ttc2019/worksync/SyncPortNamesSync.scala +++ b/solutions/RSync/src/main/scala/ttc2019/worksync/SyncPortNamesSync.scala @@ -40,7 +40,7 @@ class SyncPortNamesSync extends ISyncCompartment { def getOuterCompartment(): ISyncCompartment = SyncPortNamesSync.this - def changeName(): Unit = { + def syncSetName(): Unit = { if (!doSync) { doSync = true; var name: String = +this getName(); -- GitLab