0.8.0

- (#166) Correct rand-size list support for composite elements

Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>

Author: mballance

doc/Changelog.md

@@ -1,4 +1,7 @@
 
+## 0.8.0
+- (#166) Correct rand-size list support for composite elements
+
 ## 0.7.9
 - (#164) Correct issue with handling of soft constraints declared in dynamic-constraint blocks
 

etc/ivpm.info

@@ -1,4 +1,4 @@
 
 name=pyvsc
-version=0.7.9
+version=0.8.0
 

src/vsc/visitors/array_constraint_builder.py

@@ -4,14 +4,18 @@
 @author: ballance
 '''
 
+from ast import BinOp
 from typing import Dict, Set
 import typing
+from vsc.model.bin_expr_type import BinExprType
 from vsc.model.constraint_block_model import ConstraintBlockModel
+from vsc.model.constraint_expr_model import ConstraintExprModel
 from vsc.model.constraint_foreach_model import ConstraintForeachModel
 from vsc.model.constraint_if_else_model import ConstraintIfElseModel
 from vsc.model.constraint_inline_scope_model import ConstraintInlineScopeModel
 from vsc.model.constraint_scope_model import ConstraintScopeModel
 from vsc.model.expr_array_subscript_model import ExprArraySubscriptModel
+from vsc.model.expr_bin_model import ExprBinModel
 from vsc.model.expr_fieldref_model import ExprFieldRefModel
 from vsc.model.expr_literal_model import ExprLiteralModel
 from vsc.model.expr_model import ExprModel
@@ -39,6 +43,7 @@ def __init__(self, bound_m : Dict[FieldModel,VariableBoundModel]):
         self.foreach_scope_s = []
         self.constraint_collector_s = []
         self.foreach_ref_expander = ForeachRefExpander(self.index_set)
+        self.constraint_block = None
 
     @staticmethod
     def build(m, bound_m : typing.Dict[FieldModel,VariableBoundModel]):
@@ -49,10 +54,6 @@ def build(m, bound_m : typing.Dict[FieldModel,VariableBoundModel]):
         builder.phase = 1
         m.accept(builder)
 
-#        print("--> ArrayConstraintBuilder")
-#        print("Model: " + ModelPrettyPrinter.print(m))
-#        print("<-- ArrayConstraintBuilder")
-        
         return builder.constraints
 
     def visit_constraint_foreach(self, f:ConstraintForeachModel):
@@ -166,11 +167,30 @@ def visit_field_scalar_array(self, f:FieldArrayModel):
                 range_l = size_bound.domain.range_l
                 max_size = int(range_l[-1][1])
 
+                # Composite arrays have a maximum size of their
+                # current size, since the user must populate them
+                if not f.is_scalar:
+                    if len(f.field_l) < max_size:
+                        max_size = len(f.field_l)
+
+                        if self.constraint_block is None:
+                            self.constraint_block = ConstraintBlockModel("array_sz_c")
+                            self.constraints.append(self.constraint_block)
+
+                        # Add a constraint to limit the random size field
+                        self.constraint_block.addConstraint(ConstraintExprModel(
+                            ExprBinModel(
+                                ExprFieldRefModel(f.size),
+                                BinExprType.Le,
+                                ExprLiteralModel(len(f.field_l), False, 32)
+                            )
+                        ))
+
                 # TODO: how do we manage a max size here?                
                 if max_size > 100000:
                     raise Exception("Max size for array " + f.name + " (" + str(max_size) + " exceeds 100000")
 
-                if len(f.field_l) < max_size:
+                if len(f.field_l) < max_size and f.is_scalar:
                     # Extend the size appropriately
                     for i in range(max_size-len(f.field_l)):
                         f.add_field()
@@ -179,5 +199,3 @@ def visit_field_scalar_array(self, f:FieldArrayModel):
                 # Need to recurse into sub-fields for non-scalar arrays
                 for sf in f.field_l:
                     sf.accept(self)
-
-        

ve/unit/test_randsz_array.py

@@ -36,3 +36,28 @@ def val_c(self):
         for i in range(c.l.size):
             self.assertEqual(c.l[i], i)
 
+    def test_obj_array(self):
+        @vsc.randobj
+        class MyRandObject:
+            def __init__(self):
+                self.a =vsc.rand_bit_t(4)
+
+        @vsc.randobj
+        class TopRandObj:
+            def __init__(self):
+                self.a = vsc.randsz_list_t(MyRandObject())
+                
+                for i in range(5):
+                    self.a.append(MyRandObject())
+
+            @vsc.constraint
+            def a_c(self):
+                self.a.size < 5
+                self.a.size > 1
+
+        my_top_rand = TopRandObj()
+        my_top_rand.randomize(solve_fail_debug=1)
+        self.assertGreater(my_top_rand.a.size, 1)
+        self.assertLess(my_top_rand.a.size, 5)
+        print("Size: %d" % my_top_rand.a.size)
+