0.5.6

- (#nobug) Fix for random instability

Signed-off-by: Matthew Ballance <[email protected]>

Author: mballance

doc/Changelog.md

@@ -1,4 +1,6 @@
 
+## 0.5.6
+- (#nobug) Fix for random instability
 ## 0.5.5
 - (#nobug) Work on removing undesirable sources of randomness
   due to use of sets/maps. 

etc/ivpm.info

@@ -1,4 +1,4 @@
 
 name=pyvsc
-version=0.5.5
+version=0.5.6
 

src/vsc/model/rand_set.py

@@ -39,7 +39,9 @@ def __init__(self, order=-1):
         self.all_field_l = []
 
         self.constraint_s :Set[ConstraintModel] = set()
+        self.constraint_l : List[ConstraintModel] = []
         self.soft_constraint_s : Set[ConstraintModel] = set()
+        self.soft_constraint_l : List[ConstraintModel] = []
         self.soft_priority = 0
         self.dist_field_m = {}
 
@@ -50,13 +52,13 @@ def __init__(self, order=-1):
     def build(self, btor, constraint_l):
         for f in self.all_field_l:
             f.build(btor)
-        for c in self.constraint_s:
+        for c in self.constraint_l:
             c.build(btor)
 
     def dispose(self):
         for f in self.all_field_l:
             f.dispose()
-        for c in self.constraint_s:
+        for c in self.constraint_l:
             c.dispose()
 
     def add_field(self, f):
@@ -65,7 +67,7 @@ def add_field(self, f):
             if f.is_used_rand:
                 self.field_rand_l.append(f)
             self.all_field_l.append(f)
-        
+            
     def fields(self):
         return self.all_field_l
 
@@ -77,13 +79,18 @@ def all_fields(self)->List[FieldModel]:
 
     def add_constraint(self, c):
         if isinstance(c, ConstraintSoftModel):
-            self.soft_constraint_s.add(c)
+            if c not in self.soft_constraint_s:
+                self.soft_constraint_s.add(c)
+                self.soft_constraint_l.append(c)
         else:
-            self.constraint_s.add(c)
+            if c not in self.constraint_s:
+                self.constraint_s.add(c)
+                self.constraint_l.append(c)
 
-    def constraints(self) ->Set[ConstraintModel]:
-        return self.constraint_s
+    def constraints(self) ->List[ConstraintModel]:
+        return self.constraint_l
 
-    def soft_constraints(self) -> Set[ConstraintSoftModel]:
-        return self.soft_constraint_s
+    def soft_constraints(self) -> List[ConstraintSoftModel]:
+        return self.soft_constraint_l
+
 

src/vsc/model/rand_set_dispose_visitor.py

@@ -18,7 +18,7 @@ def __init__(self):
     def dispose(self, rs : RandSet):
         for f in rs.fields():
             f.accept(self)
-        for c in rs.constraint_s:
+        for c in rs.constraints():
             c.accept(self)
 
     def visit_scalar_field(self, f:FieldScalarModel):

src/vsc/model/rand_set_node_builder.py

@@ -21,10 +21,10 @@ def build(self, rs : RandSet):
         self.phase = 0
         for f in rs.fields():
             f.accept(self)
-        for c in rs.constraint_s:
+        for c in rs.constraints():
             c.accept(self)
         self.phase = 1
-        for c in rs.constraint_s:
+        for c in rs.constraints():
             c.accept(self)
 
     def visit_constraint_stmt_enter(self, c:ConstraintModel):

ve/unit/test_constraint_expr.py

@@ -96,7 +96,7 @@ def ab_c(self):
                 self.b < 128
 
         my_i = my_c()
-        with my_i.randomize_with() as it:
+        with my_i.randomize_with(debug=1) as it:
             it.c == (it.a + it.b)
         self.assertEqual(my_i.c, (my_i.a+my_i.b))