Upgrade to latest version of Petit Poucet and AntRUn

liflab · May 10, 2023 · a0ee7f0 · a0ee7f0
1 parent 9cf8cce
commit a0ee7f0
Show file tree

Hide file tree

Showing 22 changed files with 984 additions and 466 deletions.
diff --git a/Source/Core/build.xml b/Source/Core/build.xml
diff --git a/Source/Core/config.xml b/Source/Core/config.xml
@@ -25,6 +25,12 @@
   <!-- The project's name -->
   <name>Synthia</name>
 
+  <!-- The project's version number -->
+  <version>0.3.2</version>
+
+  <!-- The project's package (with a trailing slash) -->
+  <package>ca/uqac/lif/synthia/</package>
+
   <!-- The project's author. Currently this only
   shows up in the footer of the Javadoc documentation. -->
   <author>Sylvain Hallé, Marc-Antoine Plourde</author>
@@ -40,10 +46,11 @@
   <libdir>lib</libdir>
   <depdir>dep</depdir>
   <bindir>bin</bindir>
+  <docdir>doc</docdir>
 
   <!-- JAR filename -->
   <jar>
-    <filename>../synthia-core.jar</filename>
+    <filename>../synthia-core</filename>
   </jar>
 
   <test>
@@ -66,7 +73,7 @@
       <name>Petit Poucet Core</name>
       <classname>ca.uqac.lif.petitpoucet.Part</classname>
       <files>
-        <jar>https://github.com/liflab/petitpoucet/releases/download/v2.2/petitpoucet-core.jar</jar>
+        <jar>https://github.com/liflab/petitpoucet/releases/download/v2.3/petitpoucet-core-2.3.jar</jar>
       </files>
       <bundle>true</bundle>
     </dependency>
@@ -77,7 +84,7 @@
       <name>Petit Poucet Functions</name>
       <classname>ca.uqac.lif.petitpoucet.function.Function</classname>
       <files>
-        <jar>https://github.com/liflab/petitpoucet/releases/download/v2.2/petitpoucet-functions.jar</jar>
+        <jar>https://github.com/liflab/petitpoucet/releases/download/v2.3/petitpoucet-functions-2.3.jar</jar>
       </files>
       <bundle>true</bundle>
     </dependency>

diff --git a/Source/Core/src/ca/uqac/lif/synthia/collection/ComposeList.java b/Source/Core/src/ca/uqac/lif/synthia/collection/ComposeList.java
@@ -1,6 +1,6 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2021 Laboratoire d'informatique formelle
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
 
     This program is free software: you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.ExplanationQueryable;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.petitpoucet.function.vector.NthElement;
 import ca.uqac.lif.synthia.CannotShrinkException;
 import ca.uqac.lif.synthia.Picker;
@@ -117,7 +118,7 @@ public ComposeList<T> duplicate(boolean with_state)
 	@Override
 	public PartNode getExplanation(Part p)
 	{
-		return getExplanation(p, NodeFactory.getFactory());
+		return getExplanation(p, RelationNodeFactory.getFactory());
 	}
 
 	@Override
@@ -127,7 +128,7 @@ public String toString()
 	}
 
 	@Override
-	public PartNode getExplanation(Part p, NodeFactory f)
+	public PartNode getExplanation(Part p, RelationNodeFactory f)
 	{
 		PartNode root = f.getPartNode(p, this);
 		AndNode and = f.getAndNode();

diff --git a/Source/Core/src/ca/uqac/lif/synthia/explanation/Explanation.java b/Source/Core/src/ca/uqac/lif/synthia/explanation/Explanation.java
@@ -28,10 +28,10 @@
 import ca.uqac.lif.dag.NestedNode.NestedNodeCrawler;
 import ca.uqac.lif.dag.Node;
 import ca.uqac.lif.dag.Pin;
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.ExplanationQueryable;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.synthia.Picker;
 
 /**
@@ -43,7 +43,7 @@ public class Explanation
 {
 	public static PartNode explain(Part part, Picker<?> picker)
 	{
-		NodeFactory factory = NodeFactory.getFactory().getFactory(part, picker);
+		RelationNodeFactory factory = RelationNodeFactory.getFactory().getFactory(part, picker);
 		Queue<PartNode> to_visit = new ArrayDeque<PartNode>();
 		PartNode root = factory.getPartNode(part, picker);
 		to_visit.add(root);

diff --git a/Source/Core/src/ca/uqac/lif/synthia/random/RandomPicker.java b/Source/Core/src/ca/uqac/lif/synthia/random/RandomPicker.java
@@ -1,24 +1,28 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2021 Laboratoire d'informatique formelle
+    
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
+    
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published
     by the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
+    
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU Lesser General Public License for more details.
+    
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package ca.uqac.lif.synthia.random;
 
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.ExplanationQueryable;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.synthia.Picker;
 import ca.uqac.lif.synthia.Seedable;
 
@@ -73,11 +77,11 @@ public void reset()
 	@Override
 	public PartNode getExplanation(Part p)
 	{
-		return getExplanation(p, NodeFactory.getFactory());
+		return getExplanation(p, RelationNodeFactory.getFactory());
 	}
 
 	@Override
-	public PartNode getExplanation(Part p, NodeFactory f)
+	public PartNode getExplanation(Part p, RelationNodeFactory f)
 	{
 		return f.getPartNode(p, this);
 	}

diff --git a/Source/Core/src/ca/uqac/lif/synthia/sequence/MarkovChain.java b/Source/Core/src/ca/uqac/lif/synthia/sequence/MarkovChain.java
@@ -1,6 +1,6 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2020 Laboratoire d'informatique formelle
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
 
     This program is free software: you can redistribute it and/or modify
@@ -171,6 +171,11 @@ public T pick()
 	 */
 	protected int selectTransition(float p)
 	{
+		if (!m_transitions.containsKey(m_currentState))
+		{
+			// No transition defined
+			return -1;
+		}
 		List<Transition> transitions = m_transitions.get(m_currentState);
 		float sum_prob = 0f;
 		int last_state = -1;

diff --git a/Source/Core/src/ca/uqac/lif/synthia/sequence/Playback.java b/Source/Core/src/ca/uqac/lif/synthia/sequence/Playback.java
@@ -1,6 +1,6 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2021 Laboratoire d'informatique formelle
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
 
     This program is free software: you can redistribute it and/or modify
@@ -25,10 +25,10 @@
 
 import ca.uqac.lif.synthia.relative.PickSmallerComparable;
 import ca.uqac.lif.petitpoucet.ComposedPart;
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.ExplanationQueryable;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.petitpoucet.function.vector.NthElement;
 import ca.uqac.lif.synthia.Bounded;
 import ca.uqac.lif.synthia.NoMoreElementException;
@@ -250,11 +250,11 @@ public Shrinkable<T> shrink(T o, Picker<Float> decision, float m)
 	@Override
 	public PartNode getExplanation(Part p)
 	{
-		return getExplanation(p, NodeFactory.getFactory());
+		return getExplanation(p, RelationNodeFactory.getFactory());
 	}
 
 	@Override
-	public PartNode getExplanation(Part p, NodeFactory f)
+	public PartNode getExplanation(Part p, RelationNodeFactory f)
 	{
 		PartNode root = f.getPartNode(p, this);
 		int index = -1;

diff --git a/Source/Core/src/ca/uqac/lif/synthia/sequence/Record.java b/Source/Core/src/ca/uqac/lif/synthia/sequence/Record.java
@@ -1,6 +1,6 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2021 Laboratoire d'informatique formelle
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
 
     This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.ExplanationQueryable;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.synthia.Bounded;
 import ca.uqac.lif.synthia.Picker;
 import ca.uqac.lif.synthia.SequenceShrinkable;
@@ -145,11 +145,11 @@ public T pick()
 	@Override
 	public PartNode getExplanation(Part p)
 	{
-		return getExplanation(p, NodeFactory.getFactory());
+		return getExplanation(p, RelationNodeFactory.getFactory());
 	}
 
 	@Override
-	public PartNode getExplanation(Part p, NodeFactory f)
+	public PartNode getExplanation(Part p, RelationNodeFactory f)
 	{
 		PartNode root = f.getPartNode(p, this);
 		int index = -1;

diff --git a/Source/Core/src/ca/uqac/lif/synthia/util/Freeze.java b/Source/Core/src/ca/uqac/lif/synthia/util/Freeze.java
@@ -1,6 +1,6 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2020 Laboratoire d'informatique formelle
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
 
     This program is free software: you can redistribute it and/or modify
@@ -18,10 +18,10 @@
  */
 package ca.uqac.lif.synthia.util;
 
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.ExplanationQueryable;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.synthia.Picker;
 import ca.uqac.lif.synthia.Shrinkable;
 import ca.uqac.lif.synthia.explanation.NthSuccessiveOutput;
@@ -120,11 +120,11 @@ public Shrinkable<T> shrink(T o, Picker<Float> decision, float m)
 	@Override
 	public PartNode getExplanation(Part p)
 	{
-		return getExplanation(p, NodeFactory.getFactory());
+		return getExplanation(p, RelationNodeFactory.getFactory());
 	}
 
 	@Override
-	public PartNode getExplanation(Part p, NodeFactory f)
+	public PartNode getExplanation(Part p, RelationNodeFactory f)
 	{
 		PartNode root = f.getPartNode(p, this);
 		PartNode child = f.getPartNode(NthSuccessiveOutput.replaceOutIndexBy(p, 0), m_innerPicker);

diff --git a/Source/Core/src/ca/uqac/lif/synthia/util/Mutator.java b/Source/Core/src/ca/uqac/lif/synthia/util/Mutator.java
@@ -1,6 +1,6 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2021 Laboratoire d'informatique formelle
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
 
     This program is free software: you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.synthia.Picker;
 import ca.uqac.lif.synthia.explanation.NthSuccessiveOutput;
 
@@ -66,10 +67,10 @@ public void reset()
 
 	public PartNode getExplanation(Part p)
 	{
-		return getExplanation(p, NodeFactory.getFactory());
+		return getExplanation(p, RelationNodeFactory.getFactory());
 	}
 
-	public PartNode getExplanation(Part p, NodeFactory f)
+	public PartNode getExplanation(Part p, RelationNodeFactory f)
 	{
 		int index = NthSuccessiveOutput.mentionedOutput(p);
 		if (index < 0)

diff --git a/Source/Core/src/ca/uqac/lif/synthia/util/NothingPicker.java b/Source/Core/src/ca/uqac/lif/synthia/util/NothingPicker.java
@@ -1,6 +1,6 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2021 Laboratoire d'informatique formelle
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
 
     This program is free software: you can redistribute it and/or modify
@@ -18,10 +18,10 @@
  */
 package ca.uqac.lif.synthia.util;
 
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.ExplanationQueryable;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.synthia.NoMoreElementException;
 import ca.uqac.lif.synthia.Picker;
 import ca.uqac.lif.synthia.Shrinkable;
@@ -70,11 +70,11 @@ public Picker<T> duplicate(boolean with_state)
 	@Override
 	public PartNode getExplanation(Part p)
 	{
-		return getExplanation(p, NodeFactory.getFactory());
+		return getExplanation(p, RelationNodeFactory.getFactory());
 	}
 
 	@Override
-	public PartNode getExplanation(Part p, NodeFactory arg1)
+	public PartNode getExplanation(Part p, RelationNodeFactory arg1)
 	{
 		// Nothing is the end of the chain
 		return null;

diff --git a/Source/Core/src/ca/uqac/lif/synthia/util/Tick.java b/Source/Core/src/ca/uqac/lif/synthia/util/Tick.java
@@ -1,6 +1,6 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2020 Laboratoire d'informatique formelle
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
 
     This program is free software: you can redistribute it and/or modify
@@ -19,10 +19,10 @@
 package ca.uqac.lif.synthia.util;
 
 import ca.uqac.lif.petitpoucet.AndNode;
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.ExplanationQueryable;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.synthia.Picker;
 import ca.uqac.lif.synthia.explanation.NthSuccessiveOutput;
 import ca.uqac.lif.synthia.random.RandomFloat;
@@ -208,11 +208,11 @@ public String toString()
 	@Override
 	public PartNode getExplanation(Part p)
 	{
-		return getExplanation(p, NodeFactory.getFactory());
+		return getExplanation(p, RelationNodeFactory.getFactory());
 	}
 
 	@Override
-	public PartNode getExplanation(Part p, NodeFactory f)
+	public PartNode getExplanation(Part p, RelationNodeFactory f)
 	{
 		PartNode root = f.getPartNode(p, this);
 		int index = NthSuccessiveOutput.mentionedOutput(p);

diff --git a/Source/Core/src/ca/uqac/lif/synthia/vector/PrismPicker.java b/Source/Core/src/ca/uqac/lif/synthia/vector/PrismPicker.java
@@ -1,6 +1,6 @@
 /*
     Synthia, a data structure generator
-    Copyright (C) 2019-2021 Laboratoire d'informatique formelle
+    Copyright (C) 2019-2023 Laboratoire d'informatique formelle
     Université du Québec à Chicoutimi, Canada
 
     This program is free software: you can redistribute it and/or modify
@@ -19,10 +19,10 @@
 package ca.uqac.lif.synthia.vector;
 
 import ca.uqac.lif.petitpoucet.AndNode;
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.ExplanationQueryable;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.petitpoucet.function.vector.NthElement;
 import ca.uqac.lif.synthia.Picker;
 import ca.uqac.lif.synthia.explanation.NthSuccessiveOutput;
@@ -97,11 +97,11 @@ public int getDimension()
 	@Override
 	public PartNode getExplanation(Part p)
 	{
-		return getExplanation(p, NodeFactory.getFactory());
+		return getExplanation(p, RelationNodeFactory.getFactory());
 	}
 
 	@Override
-	public PartNode getExplanation(Part p, NodeFactory f)
+	public PartNode getExplanation(Part p, RelationNodeFactory f)
 	{
 		int index = NthSuccessiveOutput.mentionedOutput(p), part_index = NthElement.mentionedElement(p);
 		PartNode root = f.getPartNode(p, this);