fixup imports

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

src/vsc/model/constraint_expr_model.py

@@ -33,12 +33,6 @@ def __init__(self, e):
     def build(self, btor):
         return self.e.build(btor)
 
-    def get_nodes(self, node_l):
-        node_l.append(self.e.get_node())
-
-    def __str__(self):
-        return "ConstraintExpr " + str(self.e)
-
     def accept(self, visitor):
         visitor.visit_constraint_expr(self)
 

src/vsc/model/field_scalar_model.py

@@ -91,12 +91,13 @@ def get_val(self):
 
     def post_randomize(self):
         if self.var is not None:
-            val = 0
-            for b in self.var.assignment:
-                val <<= 1
-                if b == '1':
-                    val |= 1
-            self.set_val(val)
+#             val = 0
+#             for b in self.var.assignment:
+#                 val <<= 1
+#                 if b == '1':
+#                     val |= 1
+#             self.set_val(val)
+            self.set_val(int(self.var.assignment, 2))
 
         if self.rand_if is not None:
             self.rand_if.do_post_randomize()

src/vsc/model/randomizer.py

@@ -22,11 +22,11 @@
 
 from builtins import zip
 import random
+import time
 from typing import List, Dict
 
 from pyboolector import Boolector, BoolectorNode
 import pyboolector
-
 from vsc.constraints import constraint
 from vsc.model.bin_expr_type import BinExprType
 from vsc.model.constraint_model import ConstraintModel
@@ -36,16 +36,16 @@
 from vsc.model.expr_literal_model import ExprLiteralModel
 from vsc.model.expr_model import ExprModel
 from vsc.model.field_model import FieldModel
+from vsc.model.field_scalar_model import FieldScalarModel
 from vsc.model.model_visitor import ModelVisitor
 from vsc.model.rand_if import RandIF
 from vsc.model.rand_info import RandInfo
 from vsc.model.rand_info_builder import RandInfoBuilder
-from vsc.model.field_scalar_model import FieldScalarModel
-from vsc.visitors.model_pretty_printer import ModelPrettyPrinter
+from vsc.model.variable_bound_model import VariableBoundModel
 from vsc.visitors.array_constraint_builder import ArrayConstraintBuilder
 from vsc.visitors.constraint_override_rollback_visitor import ConstraintOverrideRollbackVisitor
+from vsc.visitors.model_pretty_printer import ModelPrettyPrinter
 from vsc.visitors.variable_bound_visitor import VariableBoundVisitor
-from vsc.model.variable_bound_model import VariableBoundModel
 
 
 class Randomizer(RandIF):