diff --git a/eclipse-workspace/.metadata/.log b/eclipse-workspace/.metadata/.log index a49a629..91abf60 100644 --- a/eclipse-workspace/.metadata/.log +++ b/eclipse-workspace/.metadata/.log @@ -112,3 +112,36 @@ org.eclipse.swt.SWTException: Graphic is disposed at org.eclipse.equinox.launcher.Main.basicRun(Main.java:594) at org.eclipse.equinox.launcher.Main.run(Main.java:1465) at org.eclipse.equinox.launcher.Main.main(Main.java:1438) + +!ENTRY org.eclipse.emf.cdo.explorer 4 0 2021-10-13 09:49:41.985 +!MESSAGE InterruptedException +!STACK 0 +java.lang.InterruptedException + at java.base/java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireSharedInterruptibly(AbstractQueuedSynchronizer.java:1343) + at java.base/java.util.concurrent.Semaphore.acquire(Semaphore.java:318) + at org.eclipse.net4j.util.lifecycle.Lifecycle.lock(Lifecycle.java:312) + at org.eclipse.net4j.util.lifecycle.Lifecycle.internalDeactivate(Lifecycle.java:118) + at org.eclipse.net4j.util.lifecycle.ShareableLifecycle.internalDeactivate(ShareableLifecycle.java:52) + at org.eclipse.net4j.util.lifecycle.Lifecycle.deactivate(Lifecycle.java:170) + at org.eclipse.net4j.util.lifecycle.LifecycleUtil.deactivate(LifecycleUtil.java:235) + at org.eclipse.net4j.util.lifecycle.LifecycleUtil.deactivate(LifecycleUtil.java:225) + at org.eclipse.emf.cdo.internal.explorer.bundle.OM.disposeManagers(OM.java:83) + at org.eclipse.emf.cdo.internal.explorer.bundle.OM$Activator.doStop(OM.java:136) + at org.eclipse.net4j.util.om.OSGiActivator.stop(OSGiActivator.java:92) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:871) + at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:1) + at java.base/java.security.AccessController.doPrivileged(Native Method) + at org.eclipse.osgi.internal.framework.BundleContextImpl.stop(BundleContextImpl.java:863) + at org.eclipse.osgi.internal.framework.EquinoxBundle.stopWorker0(EquinoxBundle.java:1025) + at org.eclipse.osgi.internal.framework.EquinoxBundle$EquinoxModule.stopWorker(EquinoxBundle.java:370) + at org.eclipse.osgi.container.Module.doStop(Module.java:660) + at org.eclipse.osgi.container.Module.stop(Module.java:521) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.decStartLevel(ModuleContainer.java:1886) + at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1761) + at org.eclipse.osgi.container.SystemModule.stopWorker(SystemModule.java:275) + at org.eclipse.osgi.internal.framework.EquinoxBundle$SystemBundle$EquinoxSystemModule.stopWorker(EquinoxBundle.java:202) + at org.eclipse.osgi.container.Module.doStop(Module.java:660) + at org.eclipse.osgi.container.Module.stop(Module.java:521) + at org.eclipse.osgi.container.SystemModule.stop(SystemModule.java:207) + at org.eclipse.osgi.internal.framework.EquinoxBundle$SystemBundle$EquinoxSystemModule$1.run(EquinoxBundle.java:220) + at java.base/java.lang.Thread.run(Thread.java:829) diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/d9/90a6d1754c29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1/7099264cf62b001c1296b7817fbb45d3 similarity index 55% rename from eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/d9/90a6d1754c29001c101babefb5abd0b0 rename to eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1/7099264cf62b001c1296b7817fbb45d3 index b882797..9157d17 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/d9/90a6d1754c29001c101babefb5abd0b0 +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1/7099264cf62b001c1296b7817fbb45d3 @@ -10,18 +10,19 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import petrinet.Arc; +import petrinet.Network; +import petrinet.Node; +import petrinet.PetrinetFactory; import petrinet.PetrinetPackage; import petrinet.Place; import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; import simplepdl.Process; +import simplepdl.SimplepdlPackage; import simplepdl.WorkDefinition; import simplepdl.WorkSequence; import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; +import simplepdl.Request; public class simplepdl2petrinet { @@ -41,13 +42,9 @@ public class simplepdl2petrinet { ResourceSet resSet = new ResourceSetImpl(); // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); + URI modelURI = URI.createURI("test.xmi"); Resource resource = resSet.getResource(modelURI, true); - - // Créer la ressource (modèle convertit) - URI convURI = URI.createURI("test.xmi"); - Resource conv = resSet.createResource(convURI); - + // Récupérer le premier élément du modèle (élément racine) Process process = (Process) resource.getContents().get(0); @@ -57,23 +54,41 @@ public class simplepdl2petrinet { // Créer un élément Network Network network = myFactory.createNetwork(); network.setName(process.getName()); + + // Conversion des Resource en Places + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + } // Conversion des WorkDefinition en Node et Transition for (Object o : process.getProcessElements()) { if (o instanceof WorkDefinition) { WorkDefinition wd = (WorkDefinition) o; String name = wd.getName(); - System.out.println(" - " + name); Place idle = myFactory.createPlace(); idle.setName(name + "_idle"); idle.setTokens(1); + Place started = myFactory.createPlace(); + started.setName(name + "_started"); + started.setTokens(0); Place running = myFactory.createPlace(); running.setName(name + "_running"); - running.setTokens(1); + running.setTokens(0); Place finished = myFactory.createPlace(); finished.setName(name + "_finished"); - finished.setTokens(1); + finished.setTokens(0); Arc pause2start = myFactory.createArc(); pause2start.setTarget(idle); @@ -83,10 +98,15 @@ public class simplepdl2petrinet { start2running.setTarget(running); start2running.setOutgoing(true); start2running.setWeight(1); + Arc start2started = myFactory.createArc(); + start2started.setTarget(started); + start2started.setOutgoing(true); + start2started.setWeight(1); Transition start = myFactory.createTransition(); start.setName(name + "_start"); start.getArcs().add(pause2start); start.getArcs().add(start2running); + start.getArcs().add(start2started); Arc running2finish = myFactory.createArc(); running2finish.setTarget(running); @@ -100,15 +120,89 @@ public class simplepdl2petrinet { finish.setName(name + "_finish"); finish.getArcs().add(running2finish); finish.getArcs().add(finish2finished); - + network.getNodes().add(idle); network.getNodes().add(start); + network.getNodes().add(started); network.getNodes().add(running); network.getNodes().add(finish); network.getNodes().add(finished); + + // Conversion des Requests s'il y en a + for (Request req : wd.getRequests()) { + System.out.println(req.getTarget()); + } } } + // Conversion des WorkSequence en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkSequence) { + WorkSequence ws = (WorkSequence) o; + WorkSequenceType type = ws.getLinkType(); + WorkDefinition predecessor = ws.getPredecessor(); + WorkDefinition successor = ws.getSuccessor(); + + // creation des suffixs permettant la recherche des noeuds + String predecessor_suffix = new String(); + String successor_suffix = new String(); + switch (type) { + case START_TO_START: + predecessor_suffix = "_started"; + successor_suffix = "_start"; + break; + case START_TO_FINISH: + predecessor_suffix = "_started"; + successor_suffix = "_finished"; + break; + case FINISH_TO_START: + predecessor_suffix = "_finished"; + successor_suffix = "_start"; + break; + case FINISH_TO_FINISH: + predecessor_suffix = "_finished"; + successor_suffix = "_finish"; + break; + default: + System.out.print("the fuck ?"); + break; + } + + // creation du read-arc + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(false); + arc1.setWeight(1); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(true); + arc2.setWeight(1); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(predecessor.getName() + predecessor_suffix)) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + if (node instanceof Transition) { + Transition transition = (Transition) node; + if (transition.getName().equals(successor.getName() + successor_suffix)) { + transition.getArcs().add(arc1); + transition.getArcs().add(arc2); + } + } + } + } + } + + + // Créer le nouveau xmi (modèle convertit) + URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); + Resource conv = resSet.createResource(convURI); + + // Ajouter le Network dans le nouveau modèle + conv.getContents().add(network); + // Sauver la ressource try { conv.save(Collections.EMPTY_MAP); diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1d/a052d5b8f62b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1d/a052d5b8f62b001c1296b7817fbb45d3 new file mode 100644 index 0000000..86daf30 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1d/a052d5b8f62b001c1296b7817fbb45d3 @@ -0,0 +1,237 @@ +package simplepdl.manip; + +import java.io.IOException; +import java.util.Collections; +import java.util.Map; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; + +import petrinet.Arc; +import petrinet.Network; +import petrinet.Node; +import petrinet.PetrinetFactory; +import petrinet.PetrinetPackage; +import petrinet.Place; +import petrinet.Transition; +import simplepdl.Process; +import simplepdl.SimplepdlPackage; +import simplepdl.WorkDefinition; +import simplepdl.WorkSequence; +import simplepdl.WorkSequenceType; +import simplepdl.Request; + +public class simplepdl2petrinet { + + public static void main(String[] args) { + + // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. + SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; + PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; + + // Enregistrer l'extension ".xmi" comme devant être ouverte à + // l'aide d'un objet "XMIResourceFactoryImpl" + Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; + Map m = reg.getExtensionToFactoryMap(); + m.put("xmi", new XMIResourceFactoryImpl()); + + // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) + ResourceSet resSet = new ResourceSetImpl(); + + // Charger la ressource (notre modèle) + URI modelURI = URI.createURI("test.xmi"); + Resource resource = resSet.getResource(modelURI, true); + + // Récupérer le premier élément du modèle (élément racine) + Process process = (Process) resource.getContents().get(0); + + // La fabrique pour fabriquer les éléments de PetriNET + PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; + + // Créer un élément Network + Network network = myFactory.createNetwork(); + network.setName(process.getName()); + + // Conversion des Resource en Places + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + } + + // Conversion des WorkDefinition en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkDefinition) { + WorkDefinition wd = (WorkDefinition) o; + String name = wd.getName(); + + Place idle = myFactory.createPlace(); + idle.setName(name + "_idle"); + idle.setTokens(1); + Place started = myFactory.createPlace(); + started.setName(name + "_started"); + started.setTokens(0); + Place running = myFactory.createPlace(); + running.setName(name + "_running"); + running.setTokens(0); + Place finished = myFactory.createPlace(); + finished.setName(name + "_finished"); + finished.setTokens(0); + + Arc pause2start = myFactory.createArc(); + pause2start.setTarget(idle); + pause2start.setOutgoing(false); + pause2start.setWeight(1); + Arc start2running = myFactory.createArc(); + start2running.setTarget(running); + start2running.setOutgoing(true); + start2running.setWeight(1); + Arc start2started = myFactory.createArc(); + start2started.setTarget(started); + start2started.setOutgoing(true); + start2started.setWeight(1); + Transition start = myFactory.createTransition(); + start.setName(name + "_start"); + start.getArcs().add(pause2start); + start.getArcs().add(start2running); + start.getArcs().add(start2started); + + Arc running2finish = myFactory.createArc(); + running2finish.setTarget(running); + running2finish.setOutgoing(false); + running2finish.setWeight(1); + Arc finish2finished = myFactory.createArc(); + finish2finished.setTarget(finished); + finish2finished.setOutgoing(true); + finish2finished.setWeight(1); + Transition finish = myFactory.createTransition(); + finish.setName(name + "_finish"); + finish.getArcs().add(running2finish); + finish.getArcs().add(finish2finished); + + network.getNodes().add(idle); + network.getNodes().add(start); + network.getNodes().add(started); + network.getNodes().add(running); + network.getNodes().add(finish); + network.getNodes().add(finished); + + // Conversion des Requests s'il y en a + for (Request req : wd.getRequests()) { + + int qty = req.getQuantity(); + Place target = null; + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(req.getTarget().getName())) { + target = place; + } + } + } + + Arc res2start = myFactory.createArc(); + res2start.setTarget(target); + res2start.setOutgoing(true); + res2start.setWeight(qty); + Arc finish2res = myFactory.createArc(); + finish2res.setTarget(target); + finish2res.setOutgoing(false); + finish2res.setWeight(qty); + + start.getArcs().add(res2start); + finish.getArcs().add(finish2res); + } + } + } + + // Conversion des WorkSequence en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkSequence) { + WorkSequence ws = (WorkSequence) o; + WorkSequenceType type = ws.getLinkType(); + WorkDefinition predecessor = ws.getPredecessor(); + WorkDefinition successor = ws.getSuccessor(); + + // creation des suffixs permettant la recherche des noeuds + String predecessor_suffix = new String(); + String successor_suffix = new String(); + switch (type) { + case START_TO_START: + predecessor_suffix = "_started"; + successor_suffix = "_start"; + break; + case START_TO_FINISH: + predecessor_suffix = "_started"; + successor_suffix = "_finished"; + break; + case FINISH_TO_START: + predecessor_suffix = "_finished"; + successor_suffix = "_start"; + break; + case FINISH_TO_FINISH: + predecessor_suffix = "_finished"; + successor_suffix = "_finish"; + break; + default: + System.out.print("the fuck ?"); + break; + } + + // creation du read-arc + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(false); + arc1.setWeight(1); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(true); + arc2.setWeight(1); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(predecessor.getName() + predecessor_suffix)) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + if (node instanceof Transition) { + Transition transition = (Transition) node; + if (transition.getName().equals(successor.getName() + successor_suffix)) { + transition.getArcs().add(arc1); + transition.getArcs().add(arc2); + } + } + } + } + } + + + // Créer le nouveau xmi (modèle convertit) + URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); + Resource conv = resSet.createResource(convURI); + + // Ajouter le Network dans le nouveau modèle + conv.getContents().add(network); + + // Sauver la ressource + try { + conv.save(Collections.EMPTY_MAP); + } catch (IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1e/f0a969be4929001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1e/f0a969be4929001c101babefb5abd0b0 deleted file mode 100644 index 7e5eaf8..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1e/f0a969be4929001c101babefb5abd0b0 +++ /dev/null @@ -1,129 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start) - start.getArcs().add(start2running); - - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - } - } -// -// // Ajouter le Process dans le modèle -// resource.getContents().add(process); -// -// // Ajouter deux WorkDefinitions -// WorkDefinition wd1 = myFactory.createWorkDefinition(); -// wd1.setName("Ma première WorkDefinition, quelle émotion"); -// -// WorkDefinition wd2 = myFactory.createWorkDefinition(); -// wd2.setName("Ma deuxième WorkDefinition, toujours autant d'émotion"); -// -// process.getProcessElements().add(wd1); -// process.getProcessElements().add(wd2); -// -// // Ajouter une WorkSequence entre les deux WorkDefinitions -// WorkSequence seq = myFactory.createWorkSequence(); -// seq.setPredecessor(wd1); -// seq.setSuccessor(wd2); -// seq.setLinkType(WorkSequenceType.FINISH_TO_FINISH); -// -// process.getProcessElements().add(seq); -// -// // Ajouter une deuxième WorkSequence entre les deux WorkDefinitions -// WorkSequence seq2 = myFactory.createWorkSequence(); -// seq2.setPredecessor(wd1); -// seq2.setSuccessor(wd2); -// seq2.setLinkType(WorkSequenceType.START_TO_START); -// -// process.getProcessElements().add(seq2); - - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/2f/4060c2e9f32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/2f/4060c2e9f32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..1a000ed --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/2f/4060c2e9f32b001c1296b7817fbb45d3 @@ -0,0 +1,242 @@ +package simplepdl.manip; + +import java.io.IOException; +import java.util.Collections; +import java.util.Map; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; + +import petrinet.Arc; +import petrinet.Network; +import petrinet.Node; +import petrinet.PetrinetFactory; +import petrinet.PetrinetPackage; +import petrinet.Place; +import petrinet.Transition; +import simplepdl.Process; +import simplepdl.SimplepdlPackage; +import simplepdl.WorkDefinition; +import simplepdl.WorkSequence; +import simplepdl.WorkSequenceType; +import simplepdl.Request; + +public class simplepdl2petrinet { + + public static void main(String[] args) { + + // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. + SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; + PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; + + // Enregistrer l'extension ".xmi" comme devant être ouverte à + // l'aide d'un objet "XMIResourceFactoryImpl" + Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; + Map m = reg.getExtensionToFactoryMap(); + m.put("xmi", new XMIResourceFactoryImpl()); + + // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) + ResourceSet resSet = new ResourceSetImpl(); + + // Charger la ressource (notre modèle) + URI modelURI = URI.createURI("test.xmi"); + Resource resource = resSet.getResource(modelURI, true); + + // Récupérer le premier élément du modèle (élément racine) + Process process = (Process) resource.getContents().get(0); + + // La fabrique pour fabriquer les éléments de PetriNET + PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; + + // Créer un élément Network + Network network = myFactory.createNetwork(); + network.setName(process.getName()); + + // Conversion des WorkDefinition en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkDefinition) { + WorkDefinition wd = (WorkDefinition) o; + String name = wd.getName(); + + Place idle = myFactory.createPlace(); + idle.setName(name + "_idle"); + idle.setTokens(1); + Place started = myFactory.createPlace(); + started.setName(name + "_started"); + started.setTokens(0); + Place running = myFactory.createPlace(); + running.setName(name + "_running"); + running.setTokens(0); + Place finished = myFactory.createPlace(); + finished.setName(name + "_finished"); + finished.setTokens(0); + + Arc pause2start = myFactory.createArc(); + pause2start.setTarget(idle); + pause2start.setOutgoing(false); + pause2start.setWeight(1); + Arc start2running = myFactory.createArc(); + start2running.setTarget(running); + start2running.setOutgoing(true); + start2running.setWeight(1); + Arc start2started = myFactory.createArc(); + start2started.setTarget(started); + start2started.setOutgoing(true); + start2started.setWeight(1); + Transition start = myFactory.createTransition(); + start.setName(name + "_start"); + start.getArcs().add(pause2start); + start.getArcs().add(start2running); + start.getArcs().add(start2started); + + Arc running2finish = myFactory.createArc(); + running2finish.setTarget(running); + running2finish.setOutgoing(false); + running2finish.setWeight(1); + Arc finish2finished = myFactory.createArc(); + finish2finished.setTarget(finished); + finish2finished.setOutgoing(true); + finish2finished.setWeight(1); + Transition finish = myFactory.createTransition(); + finish.setName(name + "_finish"); + finish.getArcs().add(running2finish); + finish.getArcs().add(finish2finished); + + network.getNodes().add(idle); + network.getNodes().add(start); + network.getNodes().add(started); + network.getNodes().add(running); + network.getNodes().add(finish); + network.getNodes().add(finished); + } + } + + // Conversion des WorkSequence en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkSequence) { + WorkSequence ws = (WorkSequence) o; + WorkSequenceType type = ws.getLinkType(); + WorkDefinition predecessor = ws.getPredecessor(); + WorkDefinition successor = ws.getSuccessor(); + + // creation des suffixs permettant la recherche des noeuds + String predecessor_suffix = new String(); + String successor_suffix = new String(); + switch (type) { + case START_TO_START: + predecessor_suffix = "_started"; + successor_suffix = "_start"; + break; + case START_TO_FINISH: + predecessor_suffix = "_started"; + successor_suffix = "_finished"; + break; + case FINISH_TO_START: + predecessor_suffix = "_finished"; + successor_suffix = "_start"; + break; + case FINISH_TO_FINISH: + predecessor_suffix = "_finished"; + successor_suffix = "_finish"; + break; + default: + System.out.print("the fuck ?"); + break; + } + + // creation du read-arc + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(false); + arc1.setWeight(1); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(true); + arc2.setWeight(1); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(predecessor.getName() + predecessor_suffix)) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + if (node instanceof Transition) { + Transition transition = (Transition) node; + if (transition.getName().equals(successor.getName() + successor_suffix)) { + transition.getArcs().add(arc1); + transition.getArcs().add(arc2); + } + } + } + } + } + + // Conversion des Resource et Request en Node et Arcs + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + + if (o instanceof simplepdl.Request) { + + Request r = (Request) o; + simplepdl.Resource target = r.getTarget(); + int qty = r.getQuantity(); + + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(true); + arc1.setWeight(qty); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(false); + arc2.setWeight(qty); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(target.getName()) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + } + + for (Node node : network.getNodes()) { + if (node instanceof Transition) { + Transition t = (Transition) node; + if (t.getName().equals() { + tran + } + } + } + + } + } + + // Créer le nouveau xmi (modèle convertit) + URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); + Resource conv = resSet.createResource(convURI); + + // Ajouter le Network dans le nouveau modèle + conv.getContents().add(network); + + // Sauver la ressource + try { + conv.save(Collections.EMPTY_MAP); + } catch (IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/35/b0e36f44f82b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/35/b0e36f44f82b001c1296b7817fbb45d3 new file mode 100644 index 0000000..7bdabd9 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/35/b0e36f44f82b001c1296b7817fbb45d3 @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/4b/20db4a4f4929001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/4b/20db4a4f4929001c101babefb5abd0b0 deleted file mode 100644 index c0ac3c0..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/4b/20db4a4f4929001c101babefb5abd0b0 +++ /dev/null @@ -1,104 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - } - } -// -// // Ajouter le Process dans le modèle -// resource.getContents().add(process); -// -// // Ajouter deux WorkDefinitions -// WorkDefinition wd1 = myFactory.createWorkDefinition(); -// wd1.setName("Ma première WorkDefinition, quelle émotion"); -// -// WorkDefinition wd2 = myFactory.createWorkDefinition(); -// wd2.setName("Ma deuxième WorkDefinition, toujours autant d'émotion"); -// -// process.getProcessElements().add(wd1); -// process.getProcessElements().add(wd2); -// -// // Ajouter une WorkSequence entre les deux WorkDefinitions -// WorkSequence seq = myFactory.createWorkSequence(); -// seq.setPredecessor(wd1); -// seq.setSuccessor(wd2); -// seq.setLinkType(WorkSequenceType.FINISH_TO_FINISH); -// -// process.getProcessElements().add(seq); -// -// // Ajouter une deuxième WorkSequence entre les deux WorkDefinitions -// WorkSequence seq2 = myFactory.createWorkSequence(); -// seq2.setPredecessor(wd1); -// seq2.setSuccessor(wd2); -// seq2.setLinkType(WorkSequenceType.START_TO_START); -// -// process.getProcessElements().add(seq2); - - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/5d/d023ef69f32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/5d/d023ef69f32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..cec5429 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/5d/d023ef69f32b001c1296b7817fbb45d3 @@ -0,0 +1,243 @@ +package simplepdl.manip; + +import java.io.IOException; +import java.util.Collections; +import java.util.Map; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; + +import petrinet.Arc; +import petrinet.Network; +import petrinet.Node; +import petrinet.PetrinetFactory; +import petrinet.PetrinetPackage; +import petrinet.Place; +import petrinet.Transition; +import simplepdl.Process; +import simplepdl.SimplepdlPackage; +import simplepdl.WorkDefinition; +import simplepdl.WorkSequence; +import simplepdl.WorkSequenceType; +import simplepdl.Request; + +public class simplepdl2petrinet { + + public static void main(String[] args) { + + // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. + SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; + PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; + + // Enregistrer l'extension ".xmi" comme devant être ouverte à + // l'aide d'un objet "XMIResourceFactoryImpl" + Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; + Map m = reg.getExtensionToFactoryMap(); + m.put("xmi", new XMIResourceFactoryImpl()); + + // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) + ResourceSet resSet = new ResourceSetImpl(); + + // Charger la ressource (notre modèle) + URI modelURI = URI.createURI("test.xmi"); + Resource resource = resSet.getResource(modelURI, true); + + // Récupérer le premier élément du modèle (élément racine) + Process process = (Process) resource.getContents().get(0); + + // La fabrique pour fabriquer les éléments de PetriNET + PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; + + // Créer un élément Network + Network network = myFactory.createNetwork(); + network.setName(process.getName()); + + // Conversion des WorkDefinition en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkDefinition) { + WorkDefinition wd = (WorkDefinition) o; + String name = wd.getName(); + + Place idle = myFactory.createPlace(); + idle.setName(name + "_idle"); + idle.setTokens(1); + Place started = myFactory.createPlace(); + started.setName(name + "_started"); + started.setTokens(0); + Place running = myFactory.createPlace(); + running.setName(name + "_running"); + running.setTokens(0); + Place finished = myFactory.createPlace(); + finished.setName(name + "_finished"); + finished.setTokens(0); + + Arc pause2start = myFactory.createArc(); + pause2start.setTarget(idle); + pause2start.setOutgoing(false); + pause2start.setWeight(1); + Arc start2running = myFactory.createArc(); + start2running.setTarget(running); + start2running.setOutgoing(true); + start2running.setWeight(1); + Arc start2started = myFactory.createArc(); + start2started.setTarget(started); + start2started.setOutgoing(true); + start2started.setWeight(1); + Transition start = myFactory.createTransition(); + start.setName(name + "_start"); + start.getArcs().add(pause2start); + start.getArcs().add(start2running); + start.getArcs().add(start2started); + + Arc running2finish = myFactory.createArc(); + running2finish.setTarget(running); + running2finish.setOutgoing(false); + running2finish.setWeight(1); + Arc finish2finished = myFactory.createArc(); + finish2finished.setTarget(finished); + finish2finished.setOutgoing(true); + finish2finished.setWeight(1); + Transition finish = myFactory.createTransition(); + finish.setName(name + "_finish"); + finish.getArcs().add(running2finish); + finish.getArcs().add(finish2finished); + + network.getNodes().add(idle); + network.getNodes().add(start); + network.getNodes().add(started); + network.getNodes().add(running); + network.getNodes().add(finish); + network.getNodes().add(finished); + } + } + + // Conversion des WorkSequence en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkSequence) { + WorkSequence ws = (WorkSequence) o; + WorkSequenceType type = ws.getLinkType(); + WorkDefinition predecessor = ws.getPredecessor(); + WorkDefinition successor = ws.getSuccessor(); + + // creation des suffixs permettant la recherche des noeuds + String predecessor_suffix = new String(); + String successor_suffix = new String(); + switch (type) { + case START_TO_START: + predecessor_suffix = "_started"; + successor_suffix = "_start"; + break; + case START_TO_FINISH: + predecessor_suffix = "_started"; + successor_suffix = "_finished"; + break; + case FINISH_TO_START: + predecessor_suffix = "_finished"; + successor_suffix = "_start"; + break; + case FINISH_TO_FINISH: + predecessor_suffix = "_finished"; + successor_suffix = "_finish"; + break; + default: + System.out.print("the fuck ?"); + break; + } + + // creation du read-arc + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(false); + arc1.setWeight(1); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(true); + arc2.setWeight(1); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(predecessor.getName() + predecessor_suffix)) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + if (node instanceof Transition) { + Transition transition = (Transition) node; + if (transition.getName().equals(successor.getName() + successor_suffix)) { + transition.getArcs().add(arc1); + transition.getArcs().add(arc2); + } + } + } + } + } + + // Conversion des Resource et Request en Node et Arcs + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + + if (o instanceof simplepdl.Request) { + + Request r = (Request) o; + simplepdl.Resource target = r.getTarget(); + int qty = r.getQuantity(); + + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(true); + arc1.setWeight(qty); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(false); + arc2.setWeight(qty); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(target.getName()) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + } + + for (Node node : network.getNodes()) { + if (node instanceof Transition) { + Transition t = (Transition) node; + if (t.getName().equals() { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + } + + } + } + + // Créer le nouveau xmi (modèle convertit) + URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); + Resource conv = resSet.createResource(convURI); + + // Ajouter le Network dans le nouveau modèle + conv.getContents().add(network); + + // Sauver la ressource + try { + conv.save(Collections.EMPTY_MAP); + } catch (IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c2/60a16f214c29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/65/d0637870f62b001c1296b7817fbb45d3 similarity index 52% rename from eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c2/60a16f214c29001c101babefb5abd0b0 rename to eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/65/d0637870f62b001c1296b7817fbb45d3 index 82e5050..6d78670 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c2/60a16f214c29001c101babefb5abd0b0 +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/65/d0637870f62b001c1296b7817fbb45d3 @@ -10,18 +10,19 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import petrinet.Arc; +import petrinet.Network; +import petrinet.Node; +import petrinet.PetrinetFactory; import petrinet.PetrinetPackage; import petrinet.Place; import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; import simplepdl.Process; +import simplepdl.SimplepdlPackage; import simplepdl.WorkDefinition; import simplepdl.WorkSequence; import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; +import simplepdl.Request; public class simplepdl2petrinet { @@ -41,13 +42,9 @@ public class simplepdl2petrinet { ResourceSet resSet = new ResourceSetImpl(); // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); + URI modelURI = URI.createURI("test.xmi"); Resource resource = resSet.getResource(modelURI, true); - - // Créer la ressource (modèle convertit) - URI convURI = URI.createURI("test.xmi"); - Resource conv = resSet.createResource(convURI); - + // Récupérer le premier élément du modèle (élément racine) Process process = (Process) resource.getContents().get(0); @@ -57,6 +54,22 @@ public class simplepdl2petrinet { // Créer un élément Network Network network = myFactory.createNetwork(); network.setName(process.getName()); + + // Conversion des Resource en Places + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + } // Conversion des WorkDefinition en Node et Transition for (Object o : process.getProcessElements()) { @@ -67,12 +80,15 @@ public class simplepdl2petrinet { Place idle = myFactory.createPlace(); idle.setName(name + "_idle"); idle.setTokens(1); + Place started = myFactory.createPlace(); + started.setName(name + "_started"); + started.setTokens(0); Place running = myFactory.createPlace(); running.setName(name + "_running"); - running.setTokens(1); + running.setTokens(0); Place finished = myFactory.createPlace(); finished.setName(name + "_finished"); - finished.setTokens(1); + finished.setTokens(0); Arc pause2start = myFactory.createArc(); pause2start.setTarget(idle); @@ -82,10 +98,15 @@ public class simplepdl2petrinet { start2running.setTarget(running); start2running.setOutgoing(true); start2running.setWeight(1); + Arc start2started = myFactory.createArc(); + start2started.setTarget(started); + start2started.setOutgoing(true); + start2started.setWeight(1); Transition start = myFactory.createTransition(); start.setName(name + "_start"); start.getArcs().add(pause2start); start.getArcs().add(start2running); + start.getArcs().add(start2started); Arc running2finish = myFactory.createArc(); running2finish.setTarget(running); @@ -99,15 +120,102 @@ public class simplepdl2petrinet { finish.setName(name + "_finish"); finish.getArcs().add(running2finish); finish.getArcs().add(finish2finished); - + network.getNodes().add(idle); network.getNodes().add(start); + network.getNodes().add(started); network.getNodes().add(running); network.getNodes().add(finish); network.getNodes().add(finished); + + // Conversion des Requests s'il y en a + for (Request req : wd.getRequests()) { + + Place target = null; + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(req.getTarget().getName())) { + target = place; + } + } + } + Arc res2start = myFactory.createArc(); + res2start.setTarget(target); + res2start.setOutgoing(false); + res2start.setWeight(1); + } } } + // Conversion des WorkSequence en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkSequence) { + WorkSequence ws = (WorkSequence) o; + WorkSequenceType type = ws.getLinkType(); + WorkDefinition predecessor = ws.getPredecessor(); + WorkDefinition successor = ws.getSuccessor(); + + // creation des suffixs permettant la recherche des noeuds + String predecessor_suffix = new String(); + String successor_suffix = new String(); + switch (type) { + case START_TO_START: + predecessor_suffix = "_started"; + successor_suffix = "_start"; + break; + case START_TO_FINISH: + predecessor_suffix = "_started"; + successor_suffix = "_finished"; + break; + case FINISH_TO_START: + predecessor_suffix = "_finished"; + successor_suffix = "_start"; + break; + case FINISH_TO_FINISH: + predecessor_suffix = "_finished"; + successor_suffix = "_finish"; + break; + default: + System.out.print("the fuck ?"); + break; + } + + // creation du read-arc + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(false); + arc1.setWeight(1); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(true); + arc2.setWeight(1); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(predecessor.getName() + predecessor_suffix)) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + if (node instanceof Transition) { + Transition transition = (Transition) node; + if (transition.getName().equals(successor.getName() + successor_suffix)) { + transition.getArcs().add(arc1); + transition.getArcs().add(arc2); + } + } + } + } + } + + + // Créer le nouveau xmi (modèle convertit) + URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); + Resource conv = resSet.createResource(convURI); + + // Ajouter le Network dans le nouveau modèle + conv.getContents().add(network); + // Sauver la ressource try { conv.save(Collections.EMPTY_MAP); diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/6a/709cf09af32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/6a/709cf09af32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..ea4aa56 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/6a/709cf09af32b001c1296b7817fbb45d3 @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/6a/d01b9a044a29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/6a/d01b9a044a29001c101babefb5abd0b0 deleted file mode 100644 index 5a67a85..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/6a/d01b9a044a29001c101babefb5abd0b0 +++ /dev/null @@ -1,145 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start); - start.getArcs().add(start2running); - - Arc running2finish = myFactory.createArc(); - running2finish.setTarget(running); - running2finish.setOutgoing(false); - running2finish.setWeight(1); - Arc finish2finished = myFactory.createArc(); - finish2finished.setTarget(finished); - finish2finished.setOutgoing(true); - finish2finished.setWeight(1); - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - finish.getArcs().add(running2finish); - finish.getArcs().add(finish2finished); - - network.getNodes().add(idle); - network.getNodes().add(start); - network.getNodes().add(running); - network.getNodes().add(finish); - network.getNodes().add(finished); - } - } -// -// // Ajouter le Process dans le modèle -// resource.getContents().add(process); -// -// // Ajouter deux WorkDefinitions -// WorkDefinition wd1 = myFactory.createWorkDefinition(); -// wd1.setName("Ma première WorkDefinition, quelle émotion"); -// -// WorkDefinition wd2 = myFactory.createWorkDefinition(); -// wd2.setName("Ma deuxième WorkDefinition, toujours autant d'émotion"); -// -// process.getProcessElements().add(wd1); -// process.getProcessElements().add(wd2); -// -// // Ajouter une WorkSequence entre les deux WorkDefinitions -// WorkSequence seq = myFactory.createWorkSequence(); -// seq.setPredecessor(wd1); -// seq.setSuccessor(wd2); -// seq.setLinkType(WorkSequenceType.FINISH_TO_FINISH); -// -// process.getProcessElements().add(seq); -// -// // Ajouter une deuxième WorkSequence entre les deux WorkDefinitions -// WorkSequence seq2 = myFactory.createWorkSequence(); -// seq2.setPredecessor(wd1); -// seq2.setSuccessor(wd2); -// seq2.setLinkType(WorkSequenceType.START_TO_START); -// -// process.getProcessElements().add(seq2); - - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/71/30b18e9bf32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/71/30b18e9bf32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..ea4aa56 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/71/30b18e9bf32b001c1296b7817fbb45d3 @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/74/50d65fb84a29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/74/50d65fb84a29001c101babefb5abd0b0 deleted file mode 100644 index b430824..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/74/50d65fb84a29001c101babefb5abd0b0 +++ /dev/null @@ -1,115 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("model/test.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start); - start.getArcs().add(start2running); - - Arc running2finish = myFactory.createArc(); - running2finish.setTarget(running); - running2finish.setOutgoing(false); - running2finish.setWeight(1); - Arc finish2finished = myFactory.createArc(); - finish2finished.setTarget(finished); - finish2finished.setOutgoing(true); - finish2finished.setWeight(1); - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - finish.getArcs().add(running2finish); - finish.getArcs().add(finish2finished); - - network.getNodes().add(idle); - network.getNodes().add(start); - network.getNodes().add(running); - network.getNodes().add(finish); - network.getNodes().add(finished); - } - } - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/71/f0f4019c4c29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/76/00860849f52b001c1296b7817fbb45d3 similarity index 56% rename from eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/71/f0f4019c4c29001c101babefb5abd0b0 rename to eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/76/00860849f52b001c1296b7817fbb45d3 index 009a820..4305ff9 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/71/f0f4019c4c29001c101babefb5abd0b0 +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/76/00860849f52b001c1296b7817fbb45d3 @@ -10,18 +10,19 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import petrinet.Arc; +import petrinet.Network; +import petrinet.Node; +import petrinet.PetrinetFactory; import petrinet.PetrinetPackage; import petrinet.Place; import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; import simplepdl.Process; +import simplepdl.SimplepdlPackage; import simplepdl.WorkDefinition; import simplepdl.WorkSequence; import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; +import simplepdl.Request; public class simplepdl2petrinet { @@ -41,7 +42,7 @@ public class simplepdl2petrinet { ResourceSet resSet = new ResourceSetImpl(); // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); + URI modelURI = URI.createURI("test.xmi"); Resource resource = resSet.getResource(modelURI, true); // Récupérer le premier élément du modèle (élément racine) @@ -53,23 +54,41 @@ public class simplepdl2petrinet { // Créer un élément Network Network network = myFactory.createNetwork(); network.setName(process.getName()); + + // Conversion des Resource en Places + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + } // Conversion des WorkDefinition en Node et Transition for (Object o : process.getProcessElements()) { if (o instanceof WorkDefinition) { WorkDefinition wd = (WorkDefinition) o; String name = wd.getName(); - System.out.println(" - " + name); Place idle = myFactory.createPlace(); idle.setName(name + "_idle"); idle.setTokens(1); + Place started = myFactory.createPlace(); + started.setName(name + "_started"); + started.setTokens(0); Place running = myFactory.createPlace(); running.setName(name + "_running"); - running.setTokens(1); + running.setTokens(0); Place finished = myFactory.createPlace(); finished.setName(name + "_finished"); - finished.setTokens(1); + finished.setTokens(0); Arc pause2start = myFactory.createArc(); pause2start.setTarget(idle); @@ -79,10 +98,15 @@ public class simplepdl2petrinet { start2running.setTarget(running); start2running.setOutgoing(true); start2running.setWeight(1); + Arc start2started = myFactory.createArc(); + start2started.setTarget(started); + start2started.setOutgoing(true); + start2started.setWeight(1); Transition start = myFactory.createTransition(); start.setName(name + "_start"); start.getArcs().add(pause2start); start.getArcs().add(start2running); + start.getArcs().add(start2started); Arc running2finish = myFactory.createArc(); running2finish.setTarget(running); @@ -96,18 +120,86 @@ public class simplepdl2petrinet { finish.setName(name + "_finish"); finish.getArcs().add(running2finish); finish.getArcs().add(finish2finished); - + network.getNodes().add(idle); network.getNodes().add(start); + network.getNodes().add(started); network.getNodes().add(running); network.getNodes().add(finish); network.getNodes().add(finished); + + // Conversion des Requests s'il y en a + System.out.println(wd.getRequests()); } } + // Conversion des WorkSequence en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkSequence) { + WorkSequence ws = (WorkSequence) o; + WorkSequenceType type = ws.getLinkType(); + WorkDefinition predecessor = ws.getPredecessor(); + WorkDefinition successor = ws.getSuccessor(); + + // creation des suffixs permettant la recherche des noeuds + String predecessor_suffix = new String(); + String successor_suffix = new String(); + switch (type) { + case START_TO_START: + predecessor_suffix = "_started"; + successor_suffix = "_start"; + break; + case START_TO_FINISH: + predecessor_suffix = "_started"; + successor_suffix = "_finished"; + break; + case FINISH_TO_START: + predecessor_suffix = "_finished"; + successor_suffix = "_start"; + break; + case FINISH_TO_FINISH: + predecessor_suffix = "_finished"; + successor_suffix = "_finish"; + break; + default: + System.out.print("the fuck ?"); + break; + } + + // creation du read-arc + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(false); + arc1.setWeight(1); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(true); + arc2.setWeight(1); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(predecessor.getName() + predecessor_suffix)) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + if (node instanceof Transition) { + Transition transition = (Transition) node; + if (transition.getName().equals(successor.getName() + successor_suffix)) { + transition.getArcs().add(arc1); + transition.getArcs().add(arc2); + } + } + } + } + } + + // Créer le nouveau xmi (modèle convertit) - URI convURI = URI.createURI("test.xmi"); + URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); Resource conv = resSet.createResource(convURI); + + // Ajouter le Network dans le nouveau modèle + conv.getContents().add(network); // Sauver la ressource try { diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/7a/b040fb854929001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/7a/b040fb854929001c101babefb5abd0b0 deleted file mode 100644 index 4e5b4ee..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/7a/b040fb854929001c101babefb5abd0b0 +++ /dev/null @@ -1,123 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - } - } -// -// // Ajouter le Process dans le modèle -// resource.getContents().add(process); -// -// // Ajouter deux WorkDefinitions -// WorkDefinition wd1 = myFactory.createWorkDefinition(); -// wd1.setName("Ma première WorkDefinition, quelle émotion"); -// -// WorkDefinition wd2 = myFactory.createWorkDefinition(); -// wd2.setName("Ma deuxième WorkDefinition, toujours autant d'émotion"); -// -// process.getProcessElements().add(wd1); -// process.getProcessElements().add(wd2); -// -// // Ajouter une WorkSequence entre les deux WorkDefinitions -// WorkSequence seq = myFactory.createWorkSequence(); -// seq.setPredecessor(wd1); -// seq.setSuccessor(wd2); -// seq.setLinkType(WorkSequenceType.FINISH_TO_FINISH); -// -// process.getProcessElements().add(seq); -// -// // Ajouter une deuxième WorkSequence entre les deux WorkDefinitions -// WorkSequence seq2 = myFactory.createWorkSequence(); -// seq2.setPredecessor(wd1); -// seq2.setSuccessor(wd2); -// seq2.setLinkType(WorkSequenceType.START_TO_START); -// -// process.getProcessElements().add(seq2); - - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/7b/90e98e99f32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/7b/90e98e99f32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..ea4aa56 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/7b/90e98e99f32b001c1296b7817fbb45d3 @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/2f/1026742d4d29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/8c/50db3499f62b001c1296b7817fbb45d3 similarity index 51% rename from eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/2f/1026742d4d29001c101babefb5abd0b0 rename to eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/8c/50db3499f62b001c1296b7817fbb45d3 index 25a7a08..b76c2a1 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/2f/1026742d4d29001c101babefb5abd0b0 +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/8c/50db3499f62b001c1296b7817fbb45d3 @@ -10,18 +10,19 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import petrinet.Arc; +import petrinet.Network; +import petrinet.Node; +import petrinet.PetrinetFactory; import petrinet.PetrinetPackage; import petrinet.Place; import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; import simplepdl.Process; +import simplepdl.SimplepdlPackage; import simplepdl.WorkDefinition; import simplepdl.WorkSequence; import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; +import simplepdl.Request; public class simplepdl2petrinet { @@ -38,11 +39,11 @@ public class simplepdl2petrinet { m.put("xmi", new XMIResourceFactoryImpl()); // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resGet = new ResourceSetImpl(); + ResourceSet resSet = new ResourceSetImpl(); // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resGet.getResource(modelURI, true); + URI modelURI = URI.createURI("test.xmi"); + Resource resource = resSet.getResource(modelURI, true); // Récupérer le premier élément du modèle (élément racine) Process process = (Process) resource.getContents().get(0); @@ -53,23 +54,41 @@ public class simplepdl2petrinet { // Créer un élément Network Network network = myFactory.createNetwork(); network.setName(process.getName()); + + // Conversion des Resource en Places + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + } // Conversion des WorkDefinition en Node et Transition for (Object o : process.getProcessElements()) { if (o instanceof WorkDefinition) { WorkDefinition wd = (WorkDefinition) o; String name = wd.getName(); - System.out.println(" - " + name); Place idle = myFactory.createPlace(); idle.setName(name + "_idle"); idle.setTokens(1); + Place started = myFactory.createPlace(); + started.setName(name + "_started"); + started.setTokens(0); Place running = myFactory.createPlace(); running.setName(name + "_running"); - running.setTokens(1); + running.setTokens(0); Place finished = myFactory.createPlace(); finished.setName(name + "_finished"); - finished.setTokens(1); + finished.setTokens(0); Arc pause2start = myFactory.createArc(); pause2start.setTarget(idle); @@ -79,10 +98,15 @@ public class simplepdl2petrinet { start2running.setTarget(running); start2running.setOutgoing(true); start2running.setWeight(1); + Arc start2started = myFactory.createArc(); + start2started.setTarget(started); + start2started.setOutgoing(true); + start2started.setWeight(1); Transition start = myFactory.createTransition(); start.setName(name + "_start"); start.getArcs().add(pause2start); start.getArcs().add(start2running); + start.getArcs().add(start2started); Arc running2finish = myFactory.createArc(); running2finish.setTarget(running); @@ -96,23 +120,107 @@ public class simplepdl2petrinet { finish.setName(name + "_finish"); finish.getArcs().add(running2finish); finish.getArcs().add(finish2finished); - - System.out.println(" + " + idle.getName()); - + network.getNodes().add(idle); network.getNodes().add(start); + network.getNodes().add(started); network.getNodes().add(running); network.getNodes().add(finish); network.getNodes().add(finished); + + // Conversion des Requests s'il y en a + for (Request req : wd.getRequests()) { + + int qty = req.getQuantity(); + Place target = null; + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(req.getTarget().getName())) { + target = place; + } + } + } + Arc res2start = myFactory.createArc(); + res2start.setTarget(target); + res2start.setOutgoing(true); + res2start.setWeight(qty); + Arc finish2res = myFactory.createArc(); + finish2res.setTarget(target); + finish2res.setOutgoing(false); + finish2res.setWeight(qty); + } } } - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); + // Conversion des WorkSequence en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkSequence) { + WorkSequence ws = (WorkSequence) o; + WorkSequenceType type = ws.getLinkType(); + WorkDefinition predecessor = ws.getPredecessor(); + WorkDefinition successor = ws.getSuccessor(); + + // creation des suffixs permettant la recherche des noeuds + String predecessor_suffix = new String(); + String successor_suffix = new String(); + switch (type) { + case START_TO_START: + predecessor_suffix = "_started"; + successor_suffix = "_start"; + break; + case START_TO_FINISH: + predecessor_suffix = "_started"; + successor_suffix = "_finished"; + break; + case FINISH_TO_START: + predecessor_suffix = "_finished"; + successor_suffix = "_start"; + break; + case FINISH_TO_FINISH: + predecessor_suffix = "_finished"; + successor_suffix = "_finish"; + break; + default: + System.out.print("the fuck ?"); + break; + } + + // creation du read-arc + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(false); + arc1.setWeight(1); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(true); + arc2.setWeight(1); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(predecessor.getName() + predecessor_suffix)) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + if (node instanceof Transition) { + Transition transition = (Transition) node; + if (transition.getName().equals(successor.getName() + successor_suffix)) { + transition.getArcs().add(arc1); + transition.getArcs().add(arc2); + } + } + } + } + } + // Créer le nouveau xmi (modèle convertit) - URI convURI = URI.createURI("test.xmi"); + URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); Resource conv = resSet.createResource(convURI); + + // Ajouter le Network dans le nouveau modèle + conv.getContents().add(network); // Sauver la ressource try { diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/8d/f03656ad4a29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/8d/f03656ad4a29001c101babefb5abd0b0 deleted file mode 100644 index 11a9b0f..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/8d/f03656ad4a29001c101babefb5abd0b0 +++ /dev/null @@ -1,115 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start); - start.getArcs().add(start2running); - - Arc running2finish = myFactory.createArc(); - running2finish.setTarget(running); - running2finish.setOutgoing(false); - running2finish.setWeight(1); - Arc finish2finished = myFactory.createArc(); - finish2finished.setTarget(finished); - finish2finished.setOutgoing(true); - finish2finished.setWeight(1); - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - finish.getArcs().add(running2finish); - finish.getArcs().add(finish2finished); - - network.getNodes().add(idle); - network.getNodes().add(start); - network.getNodes().add(running); - network.getNodes().add(finish); - network.getNodes().add(finished); - } - } - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/99/50d4647df32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/99/50d4647df32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..7e792e6 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/99/50d4647df32b001c1296b7817fbb45d3 @@ -0,0 +1,27 @@ +module SimplePDL2PetriNet; +create OUT: petrinet from IN: simplepdl; + +-- Obtenir le processus qui contient ce process element. +-- Remarque: Ce helper ne serait pas utile si une r�f�rence opposite +-- avait �t� plac�e entre Process et ProcessElement +helper context simplepdl!ProcessElement +def: getProcess(): simplepdl!Process = + simplepdl!Process.allInstances() + ->select(p | p.processElements->includes(self)) + ->asSequence()->first(); + +-- Traduire un Process en un PetriNet de m�me nom +rule Process2PetriNet { + from p: simplepdl!Process + to pn: petrinet!Network (name <- p.name) +} + +-- Traduire une WorkDefinition en un motif sur le r�seau de Petri +rule WorkDefinition2PetriNet { + from wd: simplepdl!WorkDefinition + to + -- PLACES d'une WorkDefinition + p_ready: petrinet!Place( + name <- wd.name + '_ready', + tokens <- 1,), +} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/9d/904f5d274d29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/9d/904f5d274d29001c101babefb5abd0b0 deleted file mode 100644 index 5b43d2f..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/9d/904f5d274d29001c101babefb5abd0b0 +++ /dev/null @@ -1,123 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resGet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resGet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - System.out.println(" - " + name); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start); - start.getArcs().add(start2running); - - Arc running2finish = myFactory.createArc(); - running2finish.setTarget(running); - running2finish.setOutgoing(false); - running2finish.setWeight(1); - Arc finish2finished = myFactory.createArc(); - finish2finished.setTarget(finished); - finish2finished.setOutgoing(true); - finish2finished.setWeight(1); - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - finish.getArcs().add(running2finish); - finish.getArcs().add(finish2finished); - - network.getNodes().add(idle); - network.getNodes().add(start); - network.getNodes().add(running); - network.getNodes().add(finish); - network.getNodes().add(finished); - } - } - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Créer le nouveau xmi (modèle convertit) - URI convURI = URI.createURI("test.xmi"); - Resource conv = resSet.createResource(convURI); - - // Sauver la ressource - try { - conv.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a3/30089d77f32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a3/30089d77f32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..0f6727a --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a3/30089d77f32b001c1296b7817fbb45d3 @@ -0,0 +1,28 @@ +module SimplePDL2PetriNet; +create OUT: petrinet from IN: simplepdl; + +-- Obtenir le processus qui contient ce process element. +-- Remarque: Ce helper ne serait pas utile si une r�f�rence opposite +-- avait �t� plac�e entre Process et ProcessElement +helper context simplepdl!ProcessElement +def: getProcess(): simplepdl!Process = + simplepdl!Process.allInstances() + ->select(p | p.processElements->includes(self)) + ->asSequence()->first(); + +-- Traduire un Process en un PetriNet de m�me nom +rule Process2PetriNet { + from p: simplepdl!Process + to pn: petrinet!Network (name <- p.name) +} + +-- Traduire une WorkDefinition en un motif sur le r�seau de Petri +rule WorkDefinition2PetriNet { + from wd: simplepdl!WorkDefinition + to + -- PLACES d'une WorkDefinition + p_ready: petrinet!Place( + name <- wd.name + '_ready', + marking <- 1, + net <- wd.getProcess()) +} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a9/50f84b7df72b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a9/50f84b7df72b001c1296b7817fbb45d3 new file mode 100644 index 0000000..0a95416 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a9/50f84b7df72b001c1296b7817fbb45d3 @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/ac/00b620a3f32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/ac/00b620a3f32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..ea4aa56 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/ac/00b620a3f32b001c1296b7817fbb45d3 @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/ae/7096f799f32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/ae/7096f799f32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..ea4aa56 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/ae/7096f799f32b001c1296b7817fbb45d3 @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/b1/609e2550f42b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/b1/609e2550f42b001c1296b7817fbb45d3 new file mode 100644 index 0000000..4df8dda --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/b1/609e2550f42b001c1296b7817fbb45d3 @@ -0,0 +1,243 @@ +package simplepdl.manip; + +import java.io.IOException; +import java.util.Collections; +import java.util.Map; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; + +import petrinet.Arc; +import petrinet.Network; +import petrinet.Node; +import petrinet.PetrinetFactory; +import petrinet.PetrinetPackage; +import petrinet.Place; +import petrinet.Transition; +import simplepdl.Process; +import simplepdl.SimplepdlPackage; +import simplepdl.WorkDefinition; +import simplepdl.WorkSequence; +import simplepdl.WorkSequenceType; +import simplepdl.Request; + +public class simplepdl2petrinet { + + public static void main(String[] args) { + + // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. + SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; + PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; + + // Enregistrer l'extension ".xmi" comme devant être ouverte à + // l'aide d'un objet "XMIResourceFactoryImpl" + Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; + Map m = reg.getExtensionToFactoryMap(); + m.put("xmi", new XMIResourceFactoryImpl()); + + // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) + ResourceSet resSet = new ResourceSetImpl(); + + // Charger la ressource (notre modèle) + URI modelURI = URI.createURI("test.xmi"); + Resource resource = resSet.getResource(modelURI, true); + + // Récupérer le premier élément du modèle (élément racine) + Process process = (Process) resource.getContents().get(0); + + // La fabrique pour fabriquer les éléments de PetriNET + PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; + + // Créer un élément Network + Network network = myFactory.createNetwork(); + network.setName(process.getName()); + + // Conversion des WorkDefinition en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkDefinition) { + WorkDefinition wd = (WorkDefinition) o; + String name = wd.getName(); + + Place idle = myFactory.createPlace(); + idle.setName(name + "_idle"); + idle.setTokens(1); + Place started = myFactory.createPlace(); + started.setName(name + "_started"); + started.setTokens(0); + Place running = myFactory.createPlace(); + running.setName(name + "_running"); + running.setTokens(0); + Place finished = myFactory.createPlace(); + finished.setName(name + "_finished"); + finished.setTokens(0); + + Arc pause2start = myFactory.createArc(); + pause2start.setTarget(idle); + pause2start.setOutgoing(false); + pause2start.setWeight(1); + Arc start2running = myFactory.createArc(); + start2running.setTarget(running); + start2running.setOutgoing(true); + start2running.setWeight(1); + Arc start2started = myFactory.createArc(); + start2started.setTarget(started); + start2started.setOutgoing(true); + start2started.setWeight(1); + Transition start = myFactory.createTransition(); + start.setName(name + "_start"); + start.getArcs().add(pause2start); + start.getArcs().add(start2running); + start.getArcs().add(start2started); + + Arc running2finish = myFactory.createArc(); + running2finish.setTarget(running); + running2finish.setOutgoing(false); + running2finish.setWeight(1); + Arc finish2finished = myFactory.createArc(); + finish2finished.setTarget(finished); + finish2finished.setOutgoing(true); + finish2finished.setWeight(1); + Transition finish = myFactory.createTransition(); + finish.setName(name + "_finish"); + finish.getArcs().add(running2finish); + finish.getArcs().add(finish2finished); + + network.getNodes().add(idle); + network.getNodes().add(start); + network.getNodes().add(started); + network.getNodes().add(running); + network.getNodes().add(finish); + network.getNodes().add(finished); + } + } + + // Conversion des WorkSequence en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkSequence) { + WorkSequence ws = (WorkSequence) o; + WorkSequenceType type = ws.getLinkType(); + WorkDefinition predecessor = ws.getPredecessor(); + WorkDefinition successor = ws.getSuccessor(); + + // creation des suffixs permettant la recherche des noeuds + String predecessor_suffix = new String(); + String successor_suffix = new String(); + switch (type) { + case START_TO_START: + predecessor_suffix = "_started"; + successor_suffix = "_start"; + break; + case START_TO_FINISH: + predecessor_suffix = "_started"; + successor_suffix = "_finished"; + break; + case FINISH_TO_START: + predecessor_suffix = "_finished"; + successor_suffix = "_start"; + break; + case FINISH_TO_FINISH: + predecessor_suffix = "_finished"; + successor_suffix = "_finish"; + break; + default: + System.out.print("the fuck ?"); + break; + } + + // creation du read-arc + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(false); + arc1.setWeight(1); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(true); + arc2.setWeight(1); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(predecessor.getName() + predecessor_suffix)) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + if (node instanceof Transition) { + Transition transition = (Transition) node; + if (transition.getName().equals(successor.getName() + successor_suffix)) { + transition.getArcs().add(arc1); + transition.getArcs().add(arc2); + } + } + } + } + } + + // Conversion des Resource et Request en Node et Arcs + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + + if (o instanceof simplepdl.Request) { + + Request r = (Request) o; + simplepdl.Resource target = r.getTarget(); + int qty = r.getQuantity(); + + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(true); + arc1.setWeight(qty); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(false); + arc2.setWeight(qty); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(target.getName()) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + } + + for (Node node : network.getNodes()) { + if (node instanceof Transition) { + Transition t = (Transition) node; + if (t.getName().equals() { + t.getArcs().add(arc1); + t.getArcs().add(arc2); + } + } + } + + } + } + + // Créer le nouveau xmi (modèle convertit) + URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); + Resource conv = resSet.createResource(convURI); + + // Ajouter le Network dans le nouveau modèle + conv.getContents().add(network); + + // Sauver la ressource + try { + conv.save(Collections.EMPTY_MAP); + } catch (IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/b2/e0b69915f52b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/b2/e0b69915f52b001c1296b7817fbb45d3 new file mode 100644 index 0000000..ab69f8b --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/b2/e0b69915f52b001c1296b7817fbb45d3 @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c/102560ba4829001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c/102560ba4829001c101babefb5abd0b0 deleted file mode 100644 index 128517c..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c/102560ba4829001c101babefb5abd0b0 +++ /dev/null @@ -1,95 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - -// -// // Ajouter le Process dans le modèle -// resource.getContents().add(process); -// -// // Ajouter deux WorkDefinitions -// WorkDefinition wd1 = myFactory.createWorkDefinition(); -// wd1.setName("Ma première WorkDefinition, quelle émotion"); -// -// WorkDefinition wd2 = myFactory.createWorkDefinition(); -// wd2.setName("Ma deuxième WorkDefinition, toujours autant d'émotion"); -// -// process.getProcessElements().add(wd1); -// process.getProcessElements().add(wd2); -// -// // Ajouter une WorkSequence entre les deux WorkDefinitions -// WorkSequence seq = myFactory.createWorkSequence(); -// seq.setPredecessor(wd1); -// seq.setSuccessor(wd2); -// seq.setLinkType(WorkSequenceType.FINISH_TO_FINISH); -// -// process.getProcessElements().add(seq); -// -// // Ajouter une deuxième WorkSequence entre les deux WorkDefinitions -// WorkSequence seq2 = myFactory.createWorkSequence(); -// seq2.setPredecessor(wd1); -// seq2.setSuccessor(wd2); -// seq2.setLinkType(WorkSequenceType.START_TO_START); -// -// process.getProcessElements().add(seq2); - - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c0/9003c0ee4b29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c0/9003c0ee4b29001c101babefb5abd0b0 deleted file mode 100644 index cf4fbb8..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c0/9003c0ee4b29001c101babefb5abd0b0 +++ /dev/null @@ -1,119 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Créer la ressource (modèle convertit) - URI convURI = URI.createURI("test.xmi"); - Resource conv = resSet.getResource(convURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start); - start.getArcs().add(start2running); - - Arc running2finish = myFactory.createArc(); - running2finish.setTarget(running); - running2finish.setOutgoing(false); - running2finish.setWeight(1); - Arc finish2finished = myFactory.createArc(); - finish2finished.setTarget(finished); - finish2finished.setOutgoing(true); - finish2finished.setWeight(1); - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - finish.getArcs().add(running2finish); - finish.getArcs().add(finish2finished); - - network.getNodes().add(idle); - network.getNodes().add(start); - network.getNodes().add(running); - network.getNodes().add(finish); - network.getNodes().add(finished); - } - } - - // Sauver la ressource - try { - conv.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c1/e0b1089ef32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c1/e0b1089ef32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..ea4aa56 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/c1/e0b1089ef32b001c1296b7817fbb45d3 @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/cb/b0c591454b29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/cb/b0c591454b29001c101babefb5abd0b0 deleted file mode 100644 index 75e9156..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/cb/b0c591454b29001c101babefb5abd0b0 +++ /dev/null @@ -1,119 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Créer la ressource (modèle convertit) - URI convURI = URI.createURI("test.xmi"); - Resource conv = resSet.getResource(convURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start); - start.getArcs().add(start2running); - - Arc running2finish = myFactory.createArc(); - running2finish.setTarget(running); - running2finish.setOutgoing(false); - running2finish.setWeight(1); - Arc finish2finished = myFactory.createArc(); - finish2finished.setTarget(finished); - finish2finished.setOutgoing(true); - finish2finished.setWeight(1); - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - finish.getArcs().add(running2finish); - finish.getArcs().add(finish2finished); - - network.getNodes().add(idle); - network.getNodes().add(start); - network.getNodes().add(running); - network.getNodes().add(finish); - network.getNodes().add(finished); - } - } - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e/f0e75c9af32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e/f0e75c9af32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..ea4aa56 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e/f0e75c9af32b001c1296b7817fbb45d3 @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e4/006e7497f32b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e4/006e7497f32b001c1296b7817fbb45d3 new file mode 100644 index 0000000..985b6f9 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e4/006e7497f32b001c1296b7817fbb45d3 @@ -0,0 +1,27 @@ +module SimplePDL2PetriNet; +create OUT: petrinet from IN: simplepdl; + +-- Obtenir le processus qui contient ce process element. +-- Remarque: Ce helper ne serait pas utile si une r�f�rence opposite +-- avait �t� plac�e entre Process et ProcessElement +helper context simplepdl!ProcessElement +def: getProcess(): simplepdl!Process = + simplepdl!Process.allInstances() + ->select(p | p.processElements->includes(self)) + ->asSequence()->first(); + +-- Traduire un Process en un PetriNet de m�me nom +rule Process2PetriNet { + from p: simplepdl!Process + to pn: petrinet!Network (name <- p.name) +} + +-- Traduire une WorkDefinition en un motif sur le r�seau de Petri +rule WorkDefinition2PetriNet { + from wd: simplepdl!WorkDefinition + to + -- PLACES d'une WorkDefinition + p_ready: petrinet!Place( + name <- wd.name + '_ready', + tokens <- 1,) +} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e4/009e2afe4929001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e4/009e2afe4929001c101babefb5abd0b0 deleted file mode 100644 index ec13165..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e4/009e2afe4929001c101babefb5abd0b0 +++ /dev/null @@ -1,139 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start); - start.getArcs().add(start2running); - - Arc running2finish = myFactory.createArc(); - running2finish.setTarget(running); - running2finish.setOutgoing(false); - running2finish.setWeight(1); - Arc finish2finished = myFactory.createArc(); - finish2finished.setTarget(finished); - finish2finished.setOutgoing(true); - finish2finished.setWeight(1); - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - finish.getArcs().add(running2finish); - finish.getArcs().add(finish2finished); - } - } -// -// // Ajouter le Process dans le modèle -// resource.getContents().add(process); -// -// // Ajouter deux WorkDefinitions -// WorkDefinition wd1 = myFactory.createWorkDefinition(); -// wd1.setName("Ma première WorkDefinition, quelle émotion"); -// -// WorkDefinition wd2 = myFactory.createWorkDefinition(); -// wd2.setName("Ma deuxième WorkDefinition, toujours autant d'émotion"); -// -// process.getProcessElements().add(wd1); -// process.getProcessElements().add(wd2); -// -// // Ajouter une WorkSequence entre les deux WorkDefinitions -// WorkSequence seq = myFactory.createWorkSequence(); -// seq.setPredecessor(wd1); -// seq.setSuccessor(wd2); -// seq.setLinkType(WorkSequenceType.FINISH_TO_FINISH); -// -// process.getProcessElements().add(seq); -// -// // Ajouter une deuxième WorkSequence entre les deux WorkDefinitions -// WorkSequence seq2 = myFactory.createWorkSequence(); -// seq2.setPredecessor(wd1); -// seq2.setSuccessor(wd2); -// seq2.setLinkType(WorkSequenceType.START_TO_START); -// -// process.getProcessElements().add(seq2); - - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e4/7011ad414b29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e4/7011ad414b29001c101babefb5abd0b0 deleted file mode 100644 index 52b6f60..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e4/7011ad414b29001c101babefb5abd0b0 +++ /dev/null @@ -1,119 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Créer la ressource (modèle convertit) - URI modelURI = URI.createURI("test.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start); - start.getArcs().add(start2running); - - Arc running2finish = myFactory.createArc(); - running2finish.setTarget(running); - running2finish.setOutgoing(false); - running2finish.setWeight(1); - Arc finish2finished = myFactory.createArc(); - finish2finished.setTarget(finished); - finish2finished.setOutgoing(true); - finish2finished.setWeight(1); - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - finish.getArcs().add(running2finish); - finish.getArcs().add(finish2finished); - - network.getNodes().add(idle); - network.getNodes().add(start); - network.getNodes().add(running); - network.getNodes().add(finish); - network.getNodes().add(finished); - } - } - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e9/e0da08204b29001c101babefb5abd0b0 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e9/e0da08204b29001c101babefb5abd0b0 deleted file mode 100644 index 11a9b0f..0000000 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e9/e0da08204b29001c101babefb5abd0b0 +++ /dev/null @@ -1,115 +0,0 @@ -package simplepdl.manip; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; - -import petrinet.PetrinetPackage; -import petrinet.Place; -import petrinet.Transition; -import petrinet.Arc; -import petrinet.Network; -import petrinet.PetrinetFactory; -import simplepdl.Process; -import simplepdl.WorkDefinition; -import simplepdl.WorkSequence; -import simplepdl.WorkSequenceType; -import simplepdl.SimplepdlFactory; -import simplepdl.SimplepdlPackage; - -public class simplepdl2petrinet { - - public static void main(String[] args) { - - // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. - SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; - PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; - - // Enregistrer l'extension ".xmi" comme devant être ouverte à - // l'aide d'un objet "XMIResourceFactoryImpl" - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("xmi", new XMIResourceFactoryImpl()); - - // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) - ResourceSet resSet = new ResourceSetImpl(); - - // Charger la ressource (notre modèle) - URI modelURI = URI.createURI("pdl-sujet.xmi"); - Resource resource = resSet.getResource(modelURI, true); - - // Récupérer le premier élément du modèle (élément racine) - Process process = (Process) resource.getContents().get(0); - - // La fabrique pour fabriquer les éléments de PetriNET - PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; - - // Créer un élément Network - Network network = myFactory.createNetwork(); - network.setName(process.getName()); - - // Conversion des WorkDefinition en Node et Transition - for (Object o : process.getProcessElements()) { - if (o instanceof WorkDefinition) { - WorkDefinition wd = (WorkDefinition) o; - String name = wd.getName(); - - Place idle = myFactory.createPlace(); - idle.setName(name + "_idle"); - idle.setTokens(1); - Place running = myFactory.createPlace(); - running.setName(name + "_running"); - running.setTokens(1); - Place finished = myFactory.createPlace(); - finished.setName(name + "_finished"); - finished.setTokens(1); - - Arc pause2start = myFactory.createArc(); - pause2start.setTarget(idle); - pause2start.setOutgoing(false); - pause2start.setWeight(1); - Arc start2running = myFactory.createArc(); - start2running.setTarget(running); - start2running.setOutgoing(true); - start2running.setWeight(1); - Transition start = myFactory.createTransition(); - start.setName(name + "_start"); - start.getArcs().add(pause2start); - start.getArcs().add(start2running); - - Arc running2finish = myFactory.createArc(); - running2finish.setTarget(running); - running2finish.setOutgoing(false); - running2finish.setWeight(1); - Arc finish2finished = myFactory.createArc(); - finish2finished.setTarget(finished); - finish2finished.setOutgoing(true); - finish2finished.setWeight(1); - Transition finish = myFactory.createTransition(); - finish.setName(name + "_finish"); - finish.getArcs().add(running2finish); - finish.getArcs().add(finish2finished); - - network.getNodes().add(idle); - network.getNodes().add(start); - network.getNodes().add(running); - network.getNodes().add(finish); - network.getNodes().add(finished); - } - } - - // Sauver la ressource - try { - resource.save(Collections.EMPTY_MAP); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/f4/906de6e9f42b001c1296b7817fbb45d3 b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/f4/906de6e9f42b001c1296b7817fbb45d3 new file mode 100644 index 0000000..b62d8dd --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.history/f4/906de6e9f42b001c1296b7817fbb45d3 @@ -0,0 +1,244 @@ +package simplepdl.manip; + +import java.io.IOException; +import java.util.Collections; +import java.util.Map; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; + +import petrinet.Arc; +import petrinet.Network; +import petrinet.Node; +import petrinet.PetrinetFactory; +import petrinet.PetrinetPackage; +import petrinet.Place; +import petrinet.Transition; +import simplepdl.Process; +import simplepdl.SimplepdlPackage; +import simplepdl.WorkDefinition; +import simplepdl.WorkSequence; +import simplepdl.WorkSequenceType; +import simplepdl.Request; + +public class simplepdl2petrinet { + + public static void main(String[] args) { + + // Charger les package SimplePDL et Petrinet afin de les enregistrer dans le registre d'Eclipse. + SimplepdlPackage packageInstance = SimplepdlPackage.eINSTANCE; + PetrinetPackage packageInstance2 = PetrinetPackage.eINSTANCE; + + // Enregistrer l'extension ".xmi" comme devant être ouverte à + // l'aide d'un objet "XMIResourceFactoryImpl" + Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; + Map m = reg.getExtensionToFactoryMap(); + m.put("xmi", new XMIResourceFactoryImpl()); + + // Créer un objet resourceSetImpl qui contiendra une ressource EMF (le modèle) + ResourceSet resSet = new ResourceSetImpl(); + + // Charger la ressource (notre modèle) + URI modelURI = URI.createURI("test.xmi"); + Resource resource = resSet.getResource(modelURI, true); + + // Récupérer le premier élément du modèle (élément racine) + Process process = (Process) resource.getContents().get(0); + + // La fabrique pour fabriquer les éléments de PetriNET + PetrinetFactory myFactory = PetrinetFactory.eINSTANCE; + + // Créer un élément Network + Network network = myFactory.createNetwork(); + network.setName(process.getName()); + + // Conversion des WorkDefinition en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkDefinition) { + WorkDefinition wd = (WorkDefinition) o; + String name = wd.getName(); + + Place idle = myFactory.createPlace(); + idle.setName(name + "_idle"); + idle.setTokens(1); + Place started = myFactory.createPlace(); + started.setName(name + "_started"); + started.setTokens(0); + Place running = myFactory.createPlace(); + running.setName(name + "_running"); + running.setTokens(0); + Place finished = myFactory.createPlace(); + finished.setName(name + "_finished"); + finished.setTokens(0); + + Arc pause2start = myFactory.createArc(); + pause2start.setTarget(idle); + pause2start.setOutgoing(false); + pause2start.setWeight(1); + Arc start2running = myFactory.createArc(); + start2running.setTarget(running); + start2running.setOutgoing(true); + start2running.setWeight(1); + Arc start2started = myFactory.createArc(); + start2started.setTarget(started); + start2started.setOutgoing(true); + start2started.setWeight(1); + Transition start = myFactory.createTransition(); + start.setName(name + "_start"); + start.getArcs().add(pause2start); + start.getArcs().add(start2running); + start.getArcs().add(start2started); + + Arc running2finish = myFactory.createArc(); + running2finish.setTarget(running); + running2finish.setOutgoing(false); + running2finish.setWeight(1); + Arc finish2finished = myFactory.createArc(); + finish2finished.setTarget(finished); + finish2finished.setOutgoing(true); + finish2finished.setWeight(1); + Transition finish = myFactory.createTransition(); + finish.setName(name + "_finish"); + finish.getArcs().add(running2finish); + finish.getArcs().add(finish2finished); + + network.getNodes().add(idle); + network.getNodes().add(start); + network.getNodes().add(started); + network.getNodes().add(running); + network.getNodes().add(finish); + network.getNodes().add(finished); + } + } + + // Conversion des WorkSequence en Node et Transition + for (Object o : process.getProcessElements()) { + if (o instanceof WorkSequence) { + WorkSequence ws = (WorkSequence) o; + WorkSequenceType type = ws.getLinkType(); + WorkDefinition predecessor = ws.getPredecessor(); + WorkDefinition successor = ws.getSuccessor(); + + // creation des suffixs permettant la recherche des noeuds + String predecessor_suffix = new String(); + String successor_suffix = new String(); + switch (type) { + case START_TO_START: + predecessor_suffix = "_started"; + successor_suffix = "_start"; + break; + case START_TO_FINISH: + predecessor_suffix = "_started"; + successor_suffix = "_finished"; + break; + case FINISH_TO_START: + predecessor_suffix = "_finished"; + successor_suffix = "_start"; + break; + case FINISH_TO_FINISH: + predecessor_suffix = "_finished"; + successor_suffix = "_finish"; + break; + default: + System.out.print("the fuck ?"); + break; + } + + // creation du read-arc + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(false); + arc1.setWeight(1); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(true); + arc2.setWeight(1); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(predecessor.getName() + predecessor_suffix)) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + if (node instanceof Transition) { + Transition transition = (Transition) node; + if (transition.getName().equals(successor.getName() + successor_suffix)) { + transition.getArcs().add(arc1); + transition.getArcs().add(arc2); + } + } + } + } + } + + // Conversion des Resource et Request en Node et Arcs + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + + if (o instanceof simplepdl.Request) { + + Request r = (Request) o; + simplepdl.Resource target = r.getTarget(); + int qty = r.getQuantity(); + + Arc arc1 = myFactory.createArc(); + arc1.setOutgoing(true); + arc1.setWeight(qty); + Arc arc2 = myFactory.createArc(); + arc2.setOutgoing(false); + arc2.setWeight(qty); + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(target.getName()) { + arc1.setTarget(place); + arc2.setTarget(place); + } + } + } + + for (Node node : network.getNodes()) { + if (node instanceof Transition) { + Transition t = (Transition) node; + if (t.getName().equals(name + "_start")) { + t.getArcs().add(arc1); + } + else if (t.getName().equals(name + "_finish")) + t.getArcs().add(arc2); + } + } + + } + } + + // Créer le nouveau xmi (modèle convertit) + URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); + Resource conv = resSet.createResource(convURI); + + // Ajouter le Network dans le nouveau modèle + conv.getContents().add(network); + + // Sauver la ressource + try { + conv.save(Collections.EMPTY_MAP); + } catch (IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.feature/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.feature/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.feature/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.feature/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.feature/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.feature/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ide/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ide/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ide/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ide/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ide/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ide/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ide/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ide/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..d9fc882 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ide/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.markers b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.markers index e921559..be5787b 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.markers and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.markers differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.markers.snap deleted file mode 100644 index 2533e04..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..a201dfe Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui.tests/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui.tests/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..500bf76 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..91f1b25 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1.ui/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..ca579ec Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl1/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.feature/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.feature/.markers.snap deleted file mode 100644 index b9c9ebc..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.feature/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.feature/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.feature/.syncinfo.snap deleted file mode 100644 index b9c9ebc..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.feature/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ide/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ide/.markers.snap deleted file mode 100644 index 58ccd56..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ide/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ide/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ide/.syncinfo.snap deleted file mode 100644 index 58ccd56..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ide/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ide/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ide/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..2ef5e86 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ide/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/.markers b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/.markers new file mode 100644 index 0000000..723b5fb Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/.markers differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/.markers.snap deleted file mode 100644 index 38887d4..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/.syncinfo.snap deleted file mode 100644 index 58ccd56..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..5d0dca1 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui.tests/.markers.snap deleted file mode 100644 index 58ccd56..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui.tests/.syncinfo.snap deleted file mode 100644 index 58ccd56..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..61b3eca Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui/.markers.snap deleted file mode 100644 index 0ac0395..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui/.syncinfo.snap deleted file mode 100644 index 58ccd56..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..3d28b59 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2.ui/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/.markers b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/.markers new file mode 100644 index 0000000..c6b5382 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/.markers differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/.markers.snap deleted file mode 100644 index 71e52ec..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/.syncinfo.snap deleted file mode 100644 index 58ccd56..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..a93acad Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl2/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ide/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ide/.markers.snap deleted file mode 100644 index b1e253e..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ide/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ide/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ide/.syncinfo.snap deleted file mode 100644 index b1e253e..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ide/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ide/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ide/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..a45c909 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ide/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/.markers b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/.markers new file mode 100644 index 0000000..9118120 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/.markers differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/.markers.snap deleted file mode 100644 index 97dcab7..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/.syncinfo.snap deleted file mode 100644 index b1e253e..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..f461936 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui.tests/.markers.snap deleted file mode 100644 index b1e253e..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui.tests/.syncinfo.snap deleted file mode 100644 index b1e253e..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..6a9e8a8 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui/.markers.snap deleted file mode 100644 index f8d217b..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui/.syncinfo.snap deleted file mode 100644 index b1e253e..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..32c3d26 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3.ui/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/.markers b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/.markers new file mode 100644 index 0000000..7a3c7e8 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/.markers differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/.markers.snap deleted file mode 100644 index d26d608..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/.syncinfo.snap deleted file mode 100644 index b1e253e..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..68594a4 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.pdl3/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.design/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.design/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.design/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.design/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.design/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.design/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.design/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.design/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..c91b82f Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.design/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..48bcce9 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.editor/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.editor/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.editor/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.editor/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.editor/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.editor/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.editor/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.editor/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..879eebb Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.editor/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.indexes/50/history.index b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.indexes/50/history.index index 2eef5b9..bf87111 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.indexes/50/history.index and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.indexes/50/history.index differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.exemples/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.feature/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.feature/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.feature/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.feature/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.feature/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.feature/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.samples/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.samples/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.samples/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.samples/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.samples/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.samples/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.tests/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.tests/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..25142d4 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA.ui/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA.ui/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA.ui/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA.ui/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA.ui/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA.ui/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA.ui/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA.ui/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..bc47433 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA.ui/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/org.eclipse.acceleo.common/acceleo.state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/org.eclipse.acceleo.common/acceleo.state.dat new file mode 100644 index 0000000..f092fa5 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/org.eclipse.acceleo.common/acceleo.state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..f14981f Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.toTINA/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..9e36e4c Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.design/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.design/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.design/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.design/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.design/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.design/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.design/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.design/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..5505776 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.design/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.edit/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.edit/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.edit/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.edit/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.edit/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.edit/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.edit/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.edit/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..5c206fc Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.edit/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.editor/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.editor/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.editor/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.editor/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.editor/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.editor/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.editor/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.editor/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..818083b Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.editor/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.exemples/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.exemples/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.exemples/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.exemples/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.exemples/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.exemples/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.feature/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.feature/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.feature/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.feature/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.feature/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.feature/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.samples/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.samples/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.samples/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.samples/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.samples/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.samples/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.tests/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.tests/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..4560d70 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT.ui/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT.ui/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT.ui/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT.ui/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT.ui/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT.ui/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT.ui/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT.ui/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..b8faa89 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT.ui/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/org.eclipse.acceleo.common/acceleo.state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/org.eclipse.acceleo.common/acceleo.state.dat new file mode 100644 index 0000000..4ba8087 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/org.eclipse.acceleo.common/acceleo.state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..8adf873 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toDOT/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML.ui/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML.ui/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML.ui/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML.ui/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML.ui/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML.ui/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML.ui/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML.ui/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..b4fccf0 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML.ui/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/.markers.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/org.eclipse.acceleo.common/acceleo.state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/org.eclipse.acceleo.common/acceleo.state.dat new file mode 100644 index 0000000..d8a5606 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/org.eclipse.acceleo.common/acceleo.state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..34a7e76 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.toHTML/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ide/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ide/.markers.snap deleted file mode 100644 index fd766bf..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ide/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ide/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ide/.syncinfo.snap deleted file mode 100644 index fd766bf..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ide/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ide/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ide/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..a5969f3 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ide/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/.markers b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/.markers new file mode 100644 index 0000000..1d147e4 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/.markers differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/.markers.snap deleted file mode 100644 index 2c15319..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/.syncinfo.snap deleted file mode 100644 index fd766bf..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..56cfd3e Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui.tests/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui.tests/.markers.snap deleted file mode 100644 index fd766bf..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui.tests/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui.tests/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui.tests/.syncinfo.snap deleted file mode 100644 index fd766bf..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui.tests/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui.tests/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui.tests/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..fc5c15c Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui.tests/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui/.markers.snap deleted file mode 100644 index b15e0f0..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui/.syncinfo.snap deleted file mode 100644 index fd766bf..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..54ee383 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl.ui/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/.markers b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/.markers new file mode 100644 index 0000000..a2693f0 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/.markers differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/.markers.snap deleted file mode 100644 index 125e955..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/.syncinfo.snap deleted file mode 100644 index fd766bf..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..730b40b Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl.txt.pdl/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.indexes/e4/fa/1/history.index b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.indexes/e4/fa/1/history.index index 3843411..71111eb 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.indexes/e4/fa/1/history.index and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.indexes/e4/fa/1/history.index differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.indexes/history.index b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.indexes/history.index index 257b7d9..bf3ca17 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.indexes/history.index and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.indexes/history.index differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.markers b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.markers index 9bb837f..bea26c1 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.markers and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.markers differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.markers.snap deleted file mode 100644 index fb9d9ae..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.syncinfo.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.syncinfo.snap deleted file mode 100644 index 837b604..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/.syncinfo.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/org.eclipse.jdt.core/state.dat b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..ccedcb0 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl/org.eclipse.jdt.core/state.dat differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl2petrinet/.indexes/history.index b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl2petrinet/.indexes/history.index new file mode 100644 index 0000000..71cf816 Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.simplepdl2petrinet/.indexes/history.index differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index index 286aa0e..cb8242f 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap deleted file mode 100644 index 318ea2d..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/28.tree b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/28.tree deleted file mode 100644 index 585d09b..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/28.tree and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/29.tree b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/29.tree new file mode 100644 index 0000000..2ae837a Binary files /dev/null and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.root/29.tree differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index 9c8ecb9..99e9fca 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/28.snap b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/28.snap deleted file mode 100644 index 022b3e0..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/28.snap and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs index ada566c..b0a3d0d 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -1,5 +1,5 @@ PROBLEMS_FILTERS_MIGRATE=true eclipse.preferences.version=1 -platformState=1631777710718 +platformState=1631777710726 quickStart=false tipsAndTricks=true diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/SimplePDL2PetriNet.launch b/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/SimplePDL2PetriNet.launch new file mode 100644 index 0000000..57b1689 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/SimplePDL2PetriNet.launch @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/toTINA.launch b/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/toTINA.launch index 2d7d080..b0a8d65 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/toTINA.launch +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/toTINA.launch @@ -4,7 +4,7 @@ - + @@ -17,6 +17,6 @@ - + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml b/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml index 5fd54c5..dfdbe97 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml @@ -3,9 +3,14 @@
- +
+
+ + + +
diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml index 6d54b85..ac473b9 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml @@ -2,6 +2,9 @@ + + + @@ -10,8 +13,6 @@ - - @@ -41,6 +42,9 @@ + + + @@ -49,8 +53,6 @@ - - diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/eclipse-workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 63dfdf4..7bc8a4b 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,8 +1,8 @@ - - + + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration - + @@ -11,9 +11,9 @@ topLevel shellMaximized - - - + + + persp.actionSet:org.eclipse.acceleo.ide.ui.editors.template.actionSet persp.actionSet:org.eclipse.ui.cheatsheets.actionSet @@ -35,34 +35,34 @@ persp.viewSC:org.eclipse.ui.views.ProblemView persp.actionSet:org.eclipse.debug.ui.launchActionSet persp.newWizSC:org.eclipse.ecoretools.emf.design.wizardID - - - + + + noFocus - + View categoryTag:Sirius - - + + View categoryTag:General - + View categoryTag:General - - - - + + + + View categoryTag:General - + View categoryTag:General @@ -70,7 +70,7 @@ - + persp.actionSet:org.eclipse.acceleo.ide.ui.editors.template.actionSet persp.actionSet:org.eclipse.ui.cheatsheets.actionSet @@ -83,53 +83,53 @@ persp.actionSet:org.eclipse.ui.actionSet.keyBindings persp.actionSet:org.eclipse.ui.actionSet.openFiles persp.newWizSC:org.eclipse.ecoretools.emf.design.wizardID - - - - + + + + View categoryTag:General NoClose - + Minimized - + View categoryTag:General NoClose - + View categoryTag:General - - - - - + + + + + View categoryTag:General NoClose - + View categoryTag:General - + General - + View categoryTag:Ecore Tools - + View categoryTag:Ecore Tools - + View categoryTag:General @@ -138,7 +138,7 @@ - + persp.actionSet:org.eclipse.acceleo.ide.ui.editors.template.actionSet persp.actionSet:org.eclipse.ui.cheatsheets.actionSet @@ -186,60 +186,60 @@ persp.viewSC:org.eclipse.jdt.ui.PackageExplorer persp.viewSC:org.eclipse.pde.ui.TargetPlatformState persp.newWizSC:org.eclipse.pde.ds.ui.wizard - - + + org.eclipse.e4.primaryNavigationStack - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Java - + View categoryTag:Plug-in Development - - - - - + + + + + View categoryTag:General - + View categoryTag:General - + org.eclipse.e4.secondaryDataStack General - + View categoryTag:General - + View categoryTag:Plug-in Development - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General @@ -247,7 +247,7 @@ - + persp.actionSet:org.eclipse.acceleo.ide.ui.editors.template.actionSet persp.actionSet:org.eclipse.ui.cheatsheets.actionSet @@ -283,62 +283,62 @@ persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard persp.perspSC:org.eclipse.acceleo.ide.ui.AcceleoPerspective persp.actionSet:org.eclipse.ui.edit.text.actionSet.presentation - - + + noFocus - + View categoryTag:Java - - - - - + + + + + View categoryTag:General - + View categoryTag:General - - + + View categoryTag:Acceleo Model to Text - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Acceleo Model to Text - + View categoryTag:Acceleo Model to Text - + View categoryTag:General @@ -346,7 +346,7 @@ - + persp.actionSet:org.eclipse.acceleo.ide.ui.editors.template.actionSet persp.actionSet:org.eclipse.ui.cheatsheets.actionSet @@ -370,38 +370,38 @@ persp.newWizSC:org.eclipse.ecoretools.emf.design.wizardID persp.newWizSC:org.eclipse.sirius.presentation.DescriptionModelWizardID persp.newWizSC:org.eclipse.sirius.ui.specificationproject.wizard - - - + + + noFocus - + View categoryTag:Sirius - - + + View categoryTag:General - + View categoryTag:General - - - - + + + + View categoryTag:General - + View categoryTag:Acceleo Model to Text - + View categoryTag:General @@ -410,2333 +410,2339 @@ - - + + View categoryTag:Help - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:Help - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:Help - - + + org.eclipse.e4.primaryDataStack EditorStack active - noFocus - - + + Editor removeOnHide org.eclipse.jdt.ui.CompilationUnitEditor active + activeOnClose - + Editor removeOnHide org.eclipse.emf.ecore.presentation.EcoreEditorID + + + Editor + removeOnHide + org.eclipse.emf.ecore.presentation.ReflectiveEditorID + + + + Editor + removeOnHide + org.eclipse.emf.ecore.presentation.ReflectiveEditorID + - + View categoryTag:Sirius - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:Ecore Tools - + ViewMenu menuContribution:menu - + - + View categoryTag:Ecore Tools - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:Java - + View categoryTag:Plug-in Development - + ViewMenu menuContribution:menu - + - + View categoryTag:Plug-in Development - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:Java - + ViewMenu menuContribution:menu - + - + View categoryTag:Acceleo Model to Text - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Acceleo Model to Text - + ViewMenu menuContribution:menu - + - + View categoryTag:Acceleo Model to Text - + ViewMenu menuContribution:menu - + - - + + toolbarSeparator - + - + Draggable - + - + toolbarSeparator - + - + Draggable - + toolbarSeparator - + - + Draggable - + Draggable - + Draggable - + Draggable - + toolbarSeparator - + - + Draggable - + - - Draggable - - - Draggable - - + toolbarSeparator - + - + toolbarSeparator - + - + Draggable - + stretch SHOW_RESTORE_MENU - + Draggable HIDEABLE SHOW_RESTORE_MENU - - + + stretch - + Draggable - + Draggable - - + + TrimStack Draggable - + TrimStack Draggable - - + + TrimStack Draggable - - - - - - - - - - - - - + + + + + + + + + + + + + platform:gtk - - - - + + + + platform:gtk - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - - - - - - - + + + + + + + + - - + + - - - + + + - - - - - + + + + + - - + + - - - + + + - - - - - - - + + + + + + + platform:gtk - - - - - + + + + + - - + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + locale:fr - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + platform:gtk - + platform:gtk - + platform:gtk - - - - - - + + + + + + - - + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - + + - - - - - - + + + + + + - - - + + + - - - + + + - - + + - - - - - - + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - + + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor removeOnHide - + View categoryTag:Acceleo Model to Text - + View categoryTag:Acceleo Model to Text - + View categoryTag:Acceleo Model to Text - + View categoryTag:Ant - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:CDO - + View categoryTag:CDO - + View categoryTag:CDO - + View categoryTag:CDO - + View categoryTag:CDO - + View categoryTag:CDO - + View categoryTag:EMF Compare - + View categoryTag:Ecore Tools - + View categoryTag:Ecore Tools - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:Debug - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java - + View categoryTag:General - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:ATL Profiler - + View categoryTag:ATL Profiler - + View categoryTag:Debug - + View categoryTag:Net4j - + View categoryTag:Net4j - + View categoryTag:Net4j Debug - + View categoryTag:Net4j Debug - + View categoryTag:OCL - + View categoryTag:Oomph - + View categoryTag:API Tools - + View categoryTag:Plug-in Development - + View categoryTag:Plug-in Development - + View categoryTag:Plug-in Development - + View categoryTag:Plug-in Development - + View categoryTag:Plug-in Development - + View categoryTag:Plug-in Development - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Sirius Profiler - + View categoryTag:Sirius - + View categoryTag:Team - + View categoryTag:Team - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Xtend - + View categoryTag:Xtext - + View categoryTag:Xtext - - + + glue move_after:PerspectiveSpacer SHOW_RESTORE_MENU - + move_after:Spacer Glue HIDEABLE SHOW_RESTORE_MENU - + glue move_after:SearchField SHOW_RESTORE_MENU - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/1610757853.index b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/1610757853.index index 272e905..11cd766 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/1610757853.index and b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/1610757853.index differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache index d17a899..da6467a 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache and b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache index 52df75c..cfd619f 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache and b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt index c5d1a1c..0591e86 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -1,47 +1,141 @@ INDEX VERSION 1.131+/home/lfainsin/miniproj_idm/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core +1404716352.index +1969063402.index 3878379995.index +76600631.index +1744987098.index 3662366827.index +4270576026.index +2682449071.index 2934523174.index +264048023.index +405568623.index 3160206024.index +1803404736.index 997444292.index +62860848.index +618880026.index +2057578931.index +2672150609.index +3911324168.index +2036772525.index +489623180.index +2313130512.index 2344539973.index +1638971146.index +2952376003.index +687162898.index +3371109373.index +3358347301.index 2744700718.index 2662280364.index +3756796416.index +2376741536.index 1610757853.index 4244811416.index 2428720068.index +4129874615.index 2321955439.index +1190385766.index 3674129442.index -69115327.index 81825197.index +3145903242.index +69115327.index +2582560612.index +1370267799.index +2151287544.index +4209134590.index +3499872082.index +4196230627.index +815506655.index 1492316222.index +3370953800.index 2127377128.index 2315287759.index 2835514616.index +124733140.index 665994362.index +1254821726.index 910095251.index +1394413366.index 2133193807.index +3228602193.index +59924782.index +2944618107.index +2979562625.index +243785569.index +3505152377.index +2029122265.index +4059096833.index +3245577179.index +3386340968.index 3982670021.index 164233854.index 686276266.index 1001394679.index +3006243032.index 1632731500.index +4188375219.index +1883890692.index +764202902.index +701648383.index 2569137636.index +113784225.index +2483472891.index +3334587369.index +1333096364.index +2423942917.index +1332398772.index 1705267537.index +1158197951.index 361289234.index 3144547538.index +2364472975.index +3761123150.index +3591232502.index +1259215892.index +1139869676.index +2677393814.index 2649436859.index 638382064.index +1366149182.index +830761727.index +3870799393.index 872930823.index 870911012.index -1612303704.index 573847568.index +1612303704.index +3439651145.index +646308851.index +594756272.index +1027991553.index +2469834123.index +2253254511.index +6020144.index +971658537.index 3977823992.index +2684007147.index +2578726767.index +4292845681.index +1803964228.index +418917818.index +2492584860.index +972949692.index 1638374812.index 1288722511.index +3771331033.index 2320756977.index +363003284.index 99599514.index 976850906.index 3969060853.index +3144173601.index +2479976885.index +722102004.index +2569761729.index +3148758245.index 3745962735.index +649822626.index +836787774.index +4164320705.index 2709714965.index diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png deleted file mode 100644 index e091ec4..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png deleted file mode 100644 index 672f75e..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png deleted file mode 100644 index 7868248..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png deleted file mode 100644 index 956a366..0000000 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png and /dev/null differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/fr.n7.petrinet.exemples/2021/10/41/refactorings.history b/eclipse-workspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/fr.n7.petrinet.exemples/2021/10/41/refactorings.history new file mode 100644 index 0000000..7c5d834 --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/fr.n7.petrinet.exemples/2021/10/41/refactorings.history @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/fr.n7.petrinet.exemples/2021/10/41/refactorings.index b/eclipse-workspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/fr.n7.petrinet.exemples/2021/10/41/refactorings.index new file mode 100644 index 0000000..0aa080c --- /dev/null +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/fr.n7.petrinet.exemples/2021/10/41/refactorings.index @@ -0,0 +1 @@ +1634108671885 Rename resource 'test_simplepdl2petrinet' diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties index e97a25e..9177bea 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties @@ -1,2 +1,2 @@ #Cached timestamps -#Tue Oct 12 16:41:40 CEST 2021 +#Wed Oct 13 09:49:41 CEST 2021 diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.tmp14793342866477167995.instance b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.tmp15434973537349615788.instance similarity index 100% rename from eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.tmp14793342866477167995.instance rename to eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.tmp15434973537349615788.instance diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/SavedExternalPluginList.txt b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/SavedExternalPluginList.txt index acbf920..fce252c 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/SavedExternalPluginList.txt +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/SavedExternalPluginList.txt @@ -1,4 +1,4 @@ -# List of external plug-in models previously loaded. Timestamp: 1634049714628 +# List of external plug-in models previously loaded. Timestamp: 1634141492700 file:/mnt/n7fs/ens/tp_cregut/eclipse-gls-2020-09/plugins/com.google.guava_27.1.0.v20190517-1946.jar file:/mnt/n7fs/ens/tp_cregut/eclipse-gls-2020-09/plugins/com.google.inject_3.0.0.v201605172100.jar file:/mnt/n7fs/ens/tp_cregut/eclipse-gls-2020-09/plugins/com.ibm.icu_67.1.0.v20200706-1749.jar diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml index 98d404f..c4dc73f 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml @@ -1,9 +1,11 @@
- + - + + +
@@ -16,7 +18,7 @@
- + @@ -28,4 +30,11 @@
+
+ + + + + +
diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml index a2734d8..a2afd0f 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -27,9 +27,13 @@
- + - + + + + +
diff --git a/eclipse-workspace/.metadata/version.ini b/eclipse-workspace/.metadata/version.ini index e8c6890..75531ec 100644 --- a/eclipse-workspace/.metadata/version.ini +++ b/eclipse-workspace/.metadata/version.ini @@ -1,3 +1,3 @@ -#Tue Oct 12 16:41:48 CEST 2021 +#Wed Oct 13 18:11:25 CEST 2021 org.eclipse.core.runtime=2 org.eclipse.platform=4.17.0.v20200902-1800 diff --git a/eclipse-workspace/fr.n7.petrinet.exemples/gen/Developpement.net b/eclipse-workspace/fr.n7.petrinet.exemples/gen/Developpement.net index 56c8406..771a1ef 100644 --- a/eclipse-workspace/fr.n7.petrinet.exemples/gen/Developpement.net +++ b/eclipse-workspace/fr.n7.petrinet.exemples/gen/Developpement.net @@ -1,4 +1,6 @@ net Developpement +pl Crayon (10) +pl Papier (20) pl Conception_idle (1) pl Conception_started (0) pl Conception_running (0) @@ -15,11 +17,11 @@ pl RedactionDocs_idle (1) pl RedactionDocs_started (0) pl RedactionDocs_running (0) pl RedactionDocs_finished (0) -tr Conception_start Conception_idle*1 -> Conception_running*1 Conception_started*1 -tr Conception_finish Conception_running*1 -> Conception_finished*1 -tr Programmation_start Programmation_idle*1 Conception_finished*1 -> Programmation_running*1 Programmation_started*1 Conception_finished*1 -tr Programmation_finish Programmation_running*1 -> Programmation_finished*1 +tr Conception_start Conception_idle*1 Papier*15 -> Conception_running*1 Conception_started*1 +tr Conception_finish Conception_running*1 -> Conception_finished*1 Papier*15 +tr Programmation_start Programmation_idle*1 Papier*15 Conception_finished*1 -> Programmation_running*1 Programmation_started*1 Conception_finished*1 +tr Programmation_finish Programmation_running*1 -> Programmation_finished*1 Papier*15 tr RedactionTests_start RedactionTests_idle*1 Conception_started*1 -> RedactionTests_running*1 RedactionTests_started*1 Conception_started*1 tr RedactionTests_finish RedactionTests_running*1 Programmation_finished*1 -> RedactionTests_finished*1 Programmation_finished*1 -tr RedactionDocs_start RedactionDocs_idle*1 Conception_started*1 -> RedactionDocs_running*1 RedactionDocs_started*1 Conception_started*1 -tr RedactionDocs_finish RedactionDocs_running*1 Conception_finished*1 -> RedactionDocs_finished*1 Conception_finished*1 +tr RedactionDocs_start RedactionDocs_idle*1 Papier*5 Crayon*5 Conception_started*1 -> RedactionDocs_running*1 RedactionDocs_started*1 Conception_started*1 +tr RedactionDocs_finish RedactionDocs_running*1 Conception_finished*1 -> RedactionDocs_finished*1 Papier*5 Crayon*5 Conception_finished*1 diff --git a/eclipse-workspace/fr.n7.petrinet.exemples/gen/test_simplepdl2petrinet.xmi b/eclipse-workspace/fr.n7.petrinet.exemples/gen/test_simplepdl2petrinet.xmi new file mode 100644 index 0000000..ea4aa56 --- /dev/null +++ b/eclipse-workspace/fr.n7.petrinet.exemples/gen/test_simplepdl2petrinet.xmi @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eclipse-workspace/fr.n7.simplepdl/models/Developpement_petrinet.xmi b/eclipse-workspace/fr.n7.simplepdl/models/Developpement_petrinet.xmi index 22698a8..3b44ea1 100644 --- a/eclipse-workspace/fr.n7.simplepdl/models/Developpement_petrinet.xmi +++ b/eclipse-workspace/fr.n7.simplepdl/models/Developpement_petrinet.xmi @@ -1,65 +1,75 @@ + + - - - + + + + - - + + + - - - - - + + + + + + - - + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + + + - - - - + + + + + + diff --git a/eclipse-workspace/fr.n7.simplepdl/src/simplepdl/manip/simplepdl2petrinet.java b/eclipse-workspace/fr.n7.simplepdl/src/simplepdl/manip/simplepdl2petrinet.java index cec5429..06aaf4c 100644 --- a/eclipse-workspace/fr.n7.simplepdl/src/simplepdl/manip/simplepdl2petrinet.java +++ b/eclipse-workspace/fr.n7.simplepdl/src/simplepdl/manip/simplepdl2petrinet.java @@ -54,6 +54,22 @@ public class simplepdl2petrinet { // Créer un élément Network Network network = myFactory.createNetwork(); network.setName(process.getName()); + + // Conversion des Resource en Places + for (Object o : process.getProcessElements()) { + if (o instanceof simplepdl.Resource) { + + simplepdl.Resource r = (simplepdl.Resource) o; + String name = r.getName(); + int qty = r.getQuantity(); + + Place res = myFactory.createPlace(); + res.setName(name); + res.setTokens(qty); + + network.getNodes().add(res); + } + } // Conversion des WorkDefinition en Node et Transition for (Object o : process.getProcessElements()) { @@ -111,6 +127,34 @@ public class simplepdl2petrinet { network.getNodes().add(running); network.getNodes().add(finish); network.getNodes().add(finished); + + // Conversion des Requests s'il y en a + for (Request req : wd.getRequests()) { + + int qty = req.getQuantity(); + Place target = null; + + for (Node node : network.getNodes()) { + if (node instanceof Place) { + Place place = (Place) node; + if (place.getName().equals(req.getTarget().getName())) { + target = place; + } + } + } + + Arc res2start = myFactory.createArc(); + res2start.setTarget(target); + res2start.setOutgoing(false); + res2start.setWeight(qty); + Arc finish2res = myFactory.createArc(); + finish2res.setTarget(target); + finish2res.setOutgoing(true); + finish2res.setWeight(qty); + + start.getArcs().add(res2start); + finish.getArcs().add(finish2res); + } } } @@ -174,56 +218,6 @@ public class simplepdl2petrinet { } } - // Conversion des Resource et Request en Node et Arcs - for (Object o : process.getProcessElements()) { - if (o instanceof simplepdl.Resource) { - - simplepdl.Resource r = (simplepdl.Resource) o; - String name = r.getName(); - int qty = r.getQuantity(); - - Place res = myFactory.createPlace(); - res.setName(name); - res.setTokens(qty); - - network.getNodes().add(res); - } - - if (o instanceof simplepdl.Request) { - - Request r = (Request) o; - simplepdl.Resource target = r.getTarget(); - int qty = r.getQuantity(); - - Arc arc1 = myFactory.createArc(); - arc1.setOutgoing(true); - arc1.setWeight(qty); - Arc arc2 = myFactory.createArc(); - arc2.setOutgoing(false); - arc2.setWeight(qty); - - for (Node node : network.getNodes()) { - if (node instanceof Place) { - Place place = (Place) node; - if (place.getName().equals(target.getName()) { - arc1.setTarget(place); - arc2.setTarget(place); - } - } - } - - for (Node node : network.getNodes()) { - if (node instanceof Transition) { - Transition t = (Transition) node; - if (t.getName().equals() { - arc1.setTarget(place); - arc2.setTarget(place); - } - } - } - - } - } // Créer le nouveau xmi (modèle convertit) URI convURI = URI.createURI("models/Developpement_petrinet.xmi"); diff --git a/eclipse-workspace/fr.n7.simplepdl/test.xmi b/eclipse-workspace/fr.n7.simplepdl/test.xmi index ab69f8b..0a95416 100644 --- a/eclipse-workspace/fr.n7.simplepdl/test.xmi +++ b/eclipse-workspace/fr.n7.simplepdl/test.xmi @@ -25,11 +25,7 @@ - - + name="RedactionTests"/> + + fr.n7.simplepdl2petrinet + + + + + + org.eclipse.m2m.atl.adt.builder.atlBuilder + + + + + + org.eclipse.m2m.atl.adt.builder.atlNature + + diff --git a/eclipse-workspace/fr.n7.simplepdl2petrinet/SimplePDL2PetriNet.asm b/eclipse-workspace/fr.n7.simplepdl2petrinet/SimplePDL2PetriNet.asm new file mode 100644 index 0000000..8a9dd04 --- /dev/null +++ b/eclipse-workspace/fr.n7.simplepdl2petrinet/SimplePDL2PetriNet.asm @@ -0,0 +1,479 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse-workspace/fr.n7.simplepdl2petrinet/SimplePDL2PetriNet.atl b/eclipse-workspace/fr.n7.simplepdl2petrinet/SimplePDL2PetriNet.atl new file mode 100644 index 0000000..77bb049 --- /dev/null +++ b/eclipse-workspace/fr.n7.simplepdl2petrinet/SimplePDL2PetriNet.atl @@ -0,0 +1,27 @@ +module SimplePDL2PetriNet; +create OUT: petrinet from IN: simplepdl; + +-- Obtenir le processus qui contient ce process element. +-- Remarque: Ce helper ne serait pas utile si une r�f�rence opposite +-- avait �t� plac�e entre Process et ProcessElement +helper context simplepdl!ProcessElement +def: getProcess(): simplepdl!Process = + simplepdl!Process.allInstances() + ->select(p | p.processElements->includes(self)) + ->asSequence()->first(); + +-- Traduire un Process en un PetriNet de m�me nom +rule Process2PetriNet { + from p: simplepdl!Process + to pn: petrinet!Network (name <- p.name) +} + +-- Traduire une WorkDefinition en un motif sur le r�seau de Petri +rule WorkDefinition2PetriNet { + from wd: simplepdl!WorkDefinition + to + -- PLACES d'une WorkDefinition + p_ready: petrinet!Place( + name <- wd.name + '_ready', + tokens <- 1) +}