Consider already chopped wires during propagation; fix bug in optimization

Author: FranzBangar

src/classy_blocks/items/wires/manager.py

@@ -66,8 +66,15 @@ def propagate_gradings(self) -> None:
             raise UndefinedGradingsError("Can't propagate: no defined wires")
 
         for wire in self.wires:
-            wire.grading = defined.grading.copy(wire.length, False)
-            wire.copy_to_coincidents()
+            # only copy to wires that have no defined coincident wires
+            # TODO: test, rethink, refactor, reimplement
+            for coincident in wire.coincidents:
+                if coincident.is_defined:
+                    coincident.copy_to_coincidents()
+                    break
+            else:
+                wire.grading = defined.grading.copy(wire.length, False)
+                wire.copy_to_coincidents()
 
     @property
     def count(self):

src/classy_blocks/optimize/optimizer.py

@@ -54,7 +54,7 @@ def fquality(params):
             reporter.junction_final = junction.quality
             reporter.grid_final = self.grid.quality
 
-            if reporter.improvement <= 0:
+            if np.isnan(reporter.improvement) or reporter.improvement <= 0:
                 reporter.rollback()
 
                 clamp.update_params(initial_params)