Testing under Linux

hovo1990 · Aug 8, 2016 · 6fbdc22 · 6fbdc22
1 parent c10b3f7
commit 6fbdc22
Show file tree

Hide file tree

Showing 44 changed files with 407 additions and 337 deletions.
diff --git a/generator/distrib/src/org/sbml/jsbml/ext/distrib/DistribConstants.java b/generator/distrib/src/org/sbml/jsbml/ext/distrib/DistribConstants.java
@@ -88,7 +88,7 @@ public class DistribConstants {
   /**
    * Generated serial version identifier.
    */
-  private static final long     serialVersionUID = 10665282730347341L;
+  private static final long     serialVersionUID = 56028862621161752L;
   /**
    *
    */

diff --git a/generator/distrib/src/org/sbml/jsbml/ext/distrib/DistribFunctionDefinitionPlugin.java b/generator/distrib/src/org/sbml/jsbml/ext/distrib/DistribFunctionDefinitionPlugin.java
@@ -40,7 +40,7 @@ public class DistribFunctionDefinitionPlugin extends AbstractSBasePlugin {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 56827866648631783L;
+  private static final long serialVersionUID = 65621163221488367L;
   /**
    *
    */
@@ -209,7 +209,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 7050931;
+    final int prime = 2591819;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/distrib/src/org/sbml/jsbml/ext/distrib/DistribInput.java b/generator/distrib/src/org/sbml/jsbml/ext/distrib/DistribInput.java
@@ -38,7 +38,7 @@ public class DistribInput extends AbstractNamedSBase {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 6934169140278435L;
+  private static final long serialVersionUID = 9286784914453098L;
   /**
    *
    */
@@ -207,7 +207,7 @@ public boolean isIndexMandatory() {
    */
   @Override
   public int hashCode() {
-    final int prime = 2976731;
+    final int prime = 8487527;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/distrib/src/org/sbml/jsbml/ext/distrib/DistribSBasePlugin.java b/generator/distrib/src/org/sbml/jsbml/ext/distrib/DistribSBasePlugin.java
@@ -41,7 +41,7 @@ public class DistribSBasePlugin extends AbstractSBasePlugin {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 41357198049908336L;
+  private static final long serialVersionUID = 42159992150721407L;
   /**
    *
    */
@@ -207,7 +207,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 5341429;
+    final int prime = 715229;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/distrib/src/org/sbml/jsbml/ext/distrib/DrawFromDistribution.java b/generator/distrib/src/org/sbml/jsbml/ext/distrib/DrawFromDistribution.java
@@ -40,7 +40,7 @@ public class DrawFromDistribution extends AbstractSBase {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 44518662788906758L;
+  private static final long serialVersionUID = 13314303560622112L;
   /**
    *
    */
@@ -91,7 +91,7 @@ public void initDefaults() {
   }
 
   /* (non-Javadoc)
-   * @see org.sbml.jsbml.SBase#equals
+   * @see org.sbml.jsbml.AbstractSBase#equals
    */
   @Override
   public boolean equals(Object object) {
@@ -114,7 +114,7 @@ public boolean equals(Object object) {
   }
 
   /* (non-Javadoc)
-   * @see org.sbml.jsbml.SBase#clone
+   * @see org.sbml.jsbml.AbstractSBase#clone
    */
   @Override
   public DrawFromDistribution clone() {
@@ -378,7 +378,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 5574713;
+    final int prime = 4756421;
 
     int hashCode = super.hashCode();
 
@@ -405,7 +405,7 @@ public String toString() {
   }
 
   /* (non-Javadoc)
-   * @see org.sbml.jsbml.SBase#readAttribute
+   * @see org.sbml.jsbml.AbstractSBase#readAttribute
    */
   @Override
   public boolean readAttribute(String attributeName, String prefix, String value) {
@@ -415,7 +415,7 @@ public boolean readAttribute(String attributeName, String prefix, String value)
   }
 
   /* (non-Javadoc)
-   * @see org.sbml.jsbml.SBase#writeXMLAttributes
+   * @see org.sbml.jsbml.AbstractSBase#writeXMLAttributes
    */
   @Override
   public Map <String, String> writeXMLAttributes() {

diff --git a/generator/distrib/src/org/sbml/jsbml/ext/distrib/Uncertainty.java b/generator/distrib/src/org/sbml/jsbml/ext/distrib/Uncertainty.java
@@ -40,7 +40,7 @@ public class Uncertainty extends AbstractNamedSBase {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 1603208487401136L;
+  private static final long serialVersionUID = 61530768229233059L;
   /**
    *
    */
@@ -178,7 +178,7 @@ public boolean unsetUncertML() {
    */
   @Override
   public int hashCode() {
-    final int prime = 8739349;
+    final int prime = 9010453;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/distrib/src/org/sbml/jsbml/xml/parsers/DistribParser.java b/generator/distrib/src/org/sbml/jsbml/xml/parsers/DistribParser.java
@@ -224,6 +224,17 @@ public void writeElement(SBMLObjectForXML xmlObject, Object sbmlElementToWrite)
 
         if (sbase instanceof ListOf<?>) {
           ListOf<?> listOf = (ListOf<?>) sbase;
+
+          if (listOf.size() > 0) {
+
+            if (listOf.get(0) instanceof FluxBound) {
+              badoooo;
+            }            else if (listOf.get(0) instanceof FluxBoundSASDSAD) {
+              test1;
+            }            else if (listOf.get(0) instancedsadsadsadaof FluxBoundSASDSAD) {
+              test2;
+            }
+          }
         } else {
           xmlObject.setName(sbase.getElementName());
         }

diff --git a/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynCompartmentPlugin.java b/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynCompartmentPlugin.java
@@ -40,7 +40,7 @@ public class DynCompartmentPlugin extends AbstractSBasePlugin {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 36565008199755507L;
+  private static final long serialVersionUID = 28875625652584702L;
   /**
    *
    */
@@ -308,7 +308,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 2088979;
+    final int prime = 5226839;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynConstants.java b/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynConstants.java
@@ -88,7 +88,7 @@ public class DynConstants {
   /**
    * Generated serial version identifier.
    */
-  private static final long     serialVersionUID = 35621351498160166L;
+  private static final long     serialVersionUID = 49461126679169125L;
   /**
    *
    */

diff --git a/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynElement.java b/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynElement.java
@@ -38,7 +38,7 @@ public class DynElement extends AbstractNamedSBase implements UniqueNamedSBase {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 10270903011922786L;
+  private static final long serialVersionUID = 33886213460338699L;
   /**
    *
    */
@@ -271,7 +271,7 @@ public boolean isMetaIdRefMandatory() {
    */
   @Override
   public int hashCode() {
-    final int prime = 6904901;
+    final int prime = 6922189;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynEventPlugin.java b/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynEventPlugin.java
@@ -40,7 +40,7 @@ public class DynEventPlugin extends AbstractSBasePlugin {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 7259283239853735L;
+  private static final long serialVersionUID = 41932345427011910L;
   /**
    *
    */
@@ -363,7 +363,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 2309491;
+    final int prime = 1399271;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynSBasePlugin.java b/generator/dyn/src/org/sbml/jsbml/ext/dyn/DynSBasePlugin.java
@@ -42,7 +42,7 @@ public class DynSBasePlugin extends AbstractSBasePlugin {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 67740245711487514L;
+  private static final long serialVersionUID = 32854485373874604L;
   /**
    *
    */
@@ -196,7 +196,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 7214861;
+    final int prime = 699649;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/dyn/src/org/sbml/jsbml/ext/dyn/SpatialComponent.java b/generator/dyn/src/org/sbml/jsbml/ext/dyn/SpatialComponent.java
@@ -38,7 +38,7 @@ public class SpatialComponent extends AbstractNamedSBase implements UniqueNamedS
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 26486719638306469L;
+  private static final long serialVersionUID = 42169863035212619L;
   /**
    *
    */
@@ -277,7 +277,7 @@ public boolean isVariableMandatory() {
    */
   @Override
   public int hashCode() {
-    final int prime = 9342769;
+    final int prime = 2832877;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/dyn/src/org/sbml/jsbml/xml/parsers/DynParser.java b/generator/dyn/src/org/sbml/jsbml/xml/parsers/DynParser.java
@@ -231,7 +231,14 @@ public void writeElement(SBMLObjectForXML xmlObject, Object sbmlElementToWrite)
           ListOf<?> listOf = (ListOf<?>) sbase;
 
           if (listOf.size() > 0) {
-          } else {
+
+            if (listOf.get(0) instanceof FluxBound) {
+              badoooo;
+            }            else if (listOf.get(0) instanceof FluxBoundSASDSAD) {
+              test1;
+            }            else if (listOf.get(0) instancedsadsadsadaof FluxBoundSASDSAD) {
+              test2;
+            }
           }
         } else {
           xmlObject.setName(sbase.getElementName());

diff --git a/generator/fbc/src/org/sbml/jsbml/ext/fbc/Association.java b/generator/fbc/src/org/sbml/jsbml/ext/fbc/Association.java
@@ -38,7 +38,7 @@ public class Association {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 612052785761829L;
+  private static final long serialVersionUID = 6357510778953447L;
 
   /**
    *  
@@ -153,7 +153,7 @@ public bool isGeneProductRef() {
    */
   @Override
   public int hashCode() {
-    final int prime = 5960957;
+    final int prime = 4489159;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcAnd.java b/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcAnd.java
@@ -39,7 +39,7 @@ public class FbcAnd extends Association {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 67099122602182335L;
+  private static final long serialVersionUID = 12284712945921276L;
   /**
    *
    */
@@ -344,7 +344,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 2909177;
+    final int prime = 1561123;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcConstants.java b/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcConstants.java
@@ -88,7 +88,7 @@ public class FbcConstants {
   /**
    * Generated serial version identifier.
    */
-  private static final long     serialVersionUID = 23993171975018655L;
+  private static final long     serialVersionUID = 12780782744578782L;
   /**
    *
    */

diff --git a/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcModelPlugin.java b/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcModelPlugin.java
@@ -40,7 +40,7 @@ public class FbcModelPlugin extends AbstractSBasePlugin {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 30059353405716312L;
+  private static final long serialVersionUID = 6510567004020872L;
   /**
    *
    */
@@ -673,7 +673,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 2109011;
+    final int prime = 7947133;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcOr.java b/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcOr.java
@@ -39,7 +39,7 @@ public class FbcOr extends Association {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 19882237259799834L;
+  private static final long serialVersionUID = 17580125746084797L;
   /**
    *
    */
@@ -344,7 +344,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 5846171;
+    final int prime = 690839;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcReactionPlugin.java b/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcReactionPlugin.java
@@ -41,7 +41,7 @@ public class FbcReactionPlugin extends AbstractSBasePlugin {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 2702277840407275L;
+  private static final long serialVersionUID = 48464996920589850L;
   /**
    *
    */
@@ -326,7 +326,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 7216277;
+    final int prime = 1321283;
 
     int hashCode = super.hashCode();
 

diff --git a/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcSpeciesPlugin.java b/generator/fbc/src/org/sbml/jsbml/ext/fbc/FbcSpeciesPlugin.java
@@ -39,7 +39,7 @@ public class FbcSpeciesPlugin extends AbstractSBasePlugin {
   /**
    * Generated serial version identifier.
    */
-  private static final long serialVersionUID = 334041732870538L;
+  private static final long serialVersionUID = 23951968356200230L;
   /**
    *
    */
@@ -251,7 +251,7 @@ public int getChildCount() {
    */
   @Override
   public int hashCode() {
-    final int prime = 6205369;
+    final int prime = 4478249;
 
     int hashCode = super.hashCode();