Update to MTNP dependency

liflab · Jan 26, 2020 · 8c06ca2 · 8c06ca2
1 parent 50c8062
commit 8c06ca2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/Source/Core/src/ca/uqac/lif/labpal/Laboratory.java b/Source/Core/src/ca/uqac/lif/labpal/Laboratory.java
@@ -98,7 +98,7 @@ public abstract class Laboratory implements OwnershipManager
   /**
    * The revision version number
    */
-  private static final transient int s_revisionVersionNumber = 5;
+  private static final transient int s_revisionVersionNumber = 6;
 
   /**
    * The set of experiments this lab has access to

diff --git a/Source/Core/src/ca/uqac/lif/labpal/server/resource/footer.inc.html b/Source/Core/src/ca/uqac/lif/labpal/server/resource/footer.inc.html
@@ -18,7 +18,7 @@ <h2 class="text-only">Main menu</h2>
 <div id="footer">
 <div>
 <div id="logo-container"><a href="https://liflab.github.io/labpal" title="LabPal {%VERSION_STRING%}"><span id="labpal-logo"><span>LabPal {%VERSION_STRING%}</span></span></a></div>
-<div id="footer-text">&copy; 2014-2019
+<div id="footer-text">&copy; 2014-2020
 <a href="http://liflab.ca">Laboratoire d'informatique formelle</a>,
 Universit&eacute; du Qu&eacute;bec &agrave; Chicoutimi.</div>
 </div>

diff --git a/Source/Core/src/ca/uqac/lif/labpal/table/ExperimentTable.java b/Source/Core/src/ca/uqac/lif/labpal/table/ExperimentTable.java
@@ -21,7 +21,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import ca.uqac.lif.json.JsonBoolean;
 import ca.uqac.lif.json.JsonElement;
 import ca.uqac.lif.json.JsonList;
 import ca.uqac.lif.json.JsonNumber;
@@ -238,6 +238,10 @@ public static PrimitiveValue jsonToPrimitive(JsonElement e)
 		{
 			return PrimitiveValue.getInstance(((JsonString) e).stringValue());
 		}
+		if (e instanceof JsonBoolean)
+    {
+      return PrimitiveValue.getInstance(((JsonBoolean) e).boolValue());
+    }
 		return null;
 
 	}

diff --git a/Source/Core/src/ca/uqac/lif/labpal/table/VersusTable.java b/Source/Core/src/ca/uqac/lif/labpal/table/VersusTable.java
@@ -1,6 +1,6 @@
 /*
   LabPal, a versatile environment for running experiments on a computer
-  Copyright (C) 2015-2017 Sylvain Hallé
+  Copyright (C) 2015-2020 Sylvain Hallé
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import ca.uqac.lif.json.JsonNull;
+import ca.uqac.lif.json.JsonNumber;
 import ca.uqac.lif.labpal.Experiment;
 import ca.uqac.lif.labpal.provenance.ExperimentValue;
 import ca.uqac.lif.mtnp.table.Table;
@@ -113,8 +114,22 @@ public TempTable getDataTable(boolean temporary)
 				continue;
 			}
 			TableEntry te = new TableEntry();
-			te.put(m_captionX, x);
-			te.put(m_captionY, y);
+			if (x instanceof JsonNumber)
+			{
+			  te.put(m_captionX, ((JsonNumber) x).numberValue());
+			}
+			else
+			{
+			  te.put(m_captionX, x);
+			}
+			if (y instanceof JsonNumber)
+      {
+        te.put(m_captionY, ((JsonNumber) y).numberValue());
+      }
+      else
+      {
+        te.put(m_captionY, y);
+      }
 			te.addDependency(m_captionX, new ExperimentValue(pair.getExperimentX(), m_parameter));
 			te.addDependency(m_captionY, new ExperimentValue(pair.getExperimentY(), m_parameter));
 			table.add(te);

diff --git a/Source/config.xml b/Source/config.xml
@@ -26,7 +26,7 @@
   <name>LabPal</name>
 
   <!-- The project's version number -->
-  <version>2.11.5</version>
+  <version>2.11.6</version>
 
   <!-- The project's author. Currently this only
   shows up in the footer of the Javadoc documentation. -->
@@ -94,7 +94,7 @@
       <name>MTNP</name>
       <classname>ca.uqac.lif.mtnp.table.Table</classname>
       <files>
-        <zip>https://github.com/liflab/mtnp/releases/download/v0.1.10-alpha/mtnp-0.1.10-alpha.zip</zip>
+        <zip>https://github.com/liflab/mtnp/releases/download/v0.1.11-alpha/mtnp-0.1.11-alpha.zip</zip>
       </files>
 	<bundle>true</bundle>
     </dependency>