Merge pull request #162 from tcmitchell/161-cardinality

Rename some VariableFeature properties
SynBioDex · Feb 2, 2021 · a467f68 · a467f68
2 parents 8ba05e5 + d569ed9
commit a467f68
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/sbol3/varcomp.py b/sbol3/varcomp.py
@@ -21,13 +21,13 @@ def __init__(self, *,
                                        initial_value=cardinality)
         self.variable = ReferencedObject(self, SBOL_VARIABLE, 1, 1,
                                          initial_value=variable)
-        self.variant = ReferencedObject(self, SBOL_VARIANT, 0, math.inf)
-        self.variant_collection = ReferencedObject(self, SBOL_VARIANT_COLLECTION,
-                                                   0, math.inf)
-        self.variant_derivation = ReferencedObject(self, SBOL_VARIANT_DERIVATION,
-                                                   0, math.inf)
-        self.variant_measure = OwnedObject(self, SBOL_VARIANT_MEASURE,
-                                           0, math.inf)
+        self.variants = ReferencedObject(self, SBOL_VARIANT, 0, math.inf)
+        self.variant_collections = ReferencedObject(self, SBOL_VARIANT_COLLECTION,
+                                                    0, math.inf)
+        self.variant_derivations = ReferencedObject(self, SBOL_VARIANT_DERIVATION,
+                                                    0, math.inf)
+        self.variant_measures = OwnedObject(self, SBOL_VARIANT_MEASURE,
+                                            0, math.inf)
         # Validate
         self.validate()
 

diff --git a/test/test_varcomp.py b/test/test_varcomp.py
@@ -57,7 +57,7 @@ def test_round_trip2(self):
         vf1 = sbol3.VariableFeature()
         hour = 'https://identifiers.org/ncit:C25529'
         m1 = sbol3.Measure(32, hour)
-        vf1.variant_measure.append(m1)
+        vf1.variant_measures.append(m1)
         cd1.variable_features.append(vf1)
         self.assertTrue(vf1.identity.startswith(cd1.identity))
         # Ensure that Measure m1 is valid. The bug tested here was that it