Ensure proper input order.

Author: Timothy Jones

cello/cello-placing/src/main/java/org/cellocad/v2/placing/algorithm/Eugene/Eugene.java

@@ -175,7 +175,7 @@ private void setDevices() {
     while (node != null) {
       final Collection<StructureDevice> devices =
           EugeneUtils.getDevices(
-              node, getTargetDataInstance().getGates(), getTargetDataInstance().getOutputDevices());
+              node, getTargetDataInstance());
       getDevicesMap().put(node, devices);
       for (final StructureDevice d : devices) {
         getDeviceNameNetlistNodeMap().put(d.getName(), node);

cello/cello-placing/src/main/java/org/cellocad/v2/placing/algorithm/Eugene/EugeneUtils.java

@@ -234,13 +234,12 @@ public static CObjectCollection<Part> getInputs(
    */
   static Collection<StructureDevice> getDevices(
       final NetlistNode node,
-      final CObjectCollection<Gate> gates,
-      final CObjectCollection<OutputDevice> reporters) {
+      final TargetDataInstance tdi) {
     final Collection<StructureDevice> rtn = new ArrayList<>();
     final String gateType = node.getResultNetlistNodeData().getDeviceName();
     final Integer num = node.getNumInEdge();
-    final Gate gate = gates.findCObjectByName(gateType);
-    final OutputDevice reporter = reporters.findCObjectByName(gateType);
+    final Gate gate = tdi.getGates().findCObjectByName(gateType);
+    final OutputDevice reporter = tdi.getOutputDevices().findCObjectByName(gateType);
     if (reporter != null) {
       final Collection<StructureDevice> devices = reporter.getStructure().getDevices();
       Integer i = 0;
@@ -271,20 +270,31 @@ static Collection<StructureDevice> getDevices(
     if (gate != null) {
       final Collection<StructureDevice> devices = gate.getStructure().getDevices();
       Integer i = 0;
+      Map<Input, Part> inputMap = getInputsMap(node, tdi);
       for (final StructureDevice d : devices) {
         final StructureDevice e = new StructureDevice(d);
         final Collection<StructureTemplate> inputs = new ArrayList<>();
+        final Collection<StructureTemplate> empty = new ArrayList<>();
         for (final StructureObject o : e.getComponents()) {
           if (o instanceof StructureTemplate) {
             i++;
             final StructureTemplate t = (StructureTemplate) o;
-            if (i <= num) {
-              continue;
+            for (Input input : inputMap.keySet()) {
+              if (input.getName().equals(o.getName())) {
+                inputs.add(t);
+              }
             }
-            inputs.add(t);
           }
         }
-        for (final StructureTemplate t : inputs) {
+        for (final StructureObject o : e.getComponents()) {
+          if (o instanceof StructureTemplate) {
+            final StructureTemplate t = (StructureTemplate) o;
+            if (!inputs.contains(t)) {
+              empty.add(t);
+            }
+          }
+        }
+        for (StructureTemplate t : empty) {
           e.getComponents().remove(t);
         }
         for (final StructureObject o : e.getComponents()) {

cello/cello-placing/src/main/java/org/cellocad/v2/placing/algorithm/Eugene/target/data/data/EugeneDevice.java

@@ -57,15 +57,18 @@ public EugeneDevice(final StructureDevice device, final Map<Input, Part> map) {
     super(device);
     List<StructureObject> components = new ArrayList<>();
     for (StructureObject obj : this.getComponents()) {
+      Boolean emptyInput = false;
       if (obj instanceof StructureTemplate) {
         for (Input input : map.keySet()) {
           if (input.getName().equals(obj.getName())) {
             StructurePart p = new StructurePart();
             p.setName(map.get(input).getName());
             components.add(p);
+          } else {
+            emptyInput = true;
           }
         }
-      } else {
+      } else if (!emptyInput) {
         components.add(obj);
       }
     }

cello/cello-technologymapping/src/main/java/org/cellocad/v2/results/technologyMapping/CytometryPlotUtils.java

@@ -74,9 +74,13 @@ private static List<Double> getXData(final NetlistNode node) {
     List<Double> rtn = new ArrayList<>();
     AssignableDevice a = node.getResultNetlistNodeData().getDevice();
     Gate g = (Gate) a;
-    BivariateLookupTableFunction c =
-        (BivariateLookupTableFunction) g.getModel().getFunctionByName("cytometry");
-    rtn = c.getYDataAtIdx(0);
+    BivariateLookupTableFunction c = null;
+    c = (BivariateLookupTableFunction) g.getModel().getFunctionByName("cytometry");
+    if (c != null) {
+      rtn = c.getYDataAtIdx(0);
+    } else {
+      rtn = null;
+    }
     return rtn;
   }
 
@@ -151,6 +155,9 @@ private static String getPlotScript(
     for (int i = 0; i < states.getNumStates(); i++) {
       State<NetlistNode> state = states.getStateAtIdx(i);
       final List<Double> x = getXData(node);
+      if (x == null) {
+        return null;
+      }
       final List<Double> y = getYData(node, tmae, ec, state);
       final String fmt = "ax[%d].plot([%s], [%s])" + Utils.getNewLine();
       final String xArr = String.join(",", getDoubleList(x));
@@ -182,6 +189,9 @@ private static void generatePlot(
     final String outDir = runEnv.getOptionValue(ArgString.OUTPUTDIR);
     // script
     final String script = getPlotScript(node, lsle, tmae, ec, outDir);
+    if (script == null) {
+      return;
+    }
     final String scriptFilename = outDir + Utils.getFileSeparator() + getPlotScriptFilename(node);
     Utils.writeToFile(script, scriptFilename);
     // plot