Fix/log/tuple datum value

psyneulink/components/states/modulatorysignals/controlsignal.py

@@ -957,48 +957,48 @@ def update(self, params=None, time_scale=TimeScale.TRIAL, context=None):
                 cost_change_string = "+" + str(cost_change)
             print("Cost: {0} [{1}])".format(self.cost, cost_change_string))
 
-        #region Record control_signal values in owner Mechanism's log
-        # Notes:
-        # * Log control_signals for ALL states of a given Mechanism in the Mechanism's log
-        # * Log control_signals for EACH state in a separate entry of the Mechanism's log
-
-        # Get receiver Mechanism and state
-        controller = self.owner
-
-        # Get logPref for Mechanism
-        log_pref = controller.prefs.logPref
-
-        # Get context
-        if not context:
-            context = controller.name + " " + self.name + kwAssign
-        else:
-            context = context + SEPARATOR_BAR + self.name + kwAssign
-
-        # If context is consistent with log_pref:
-        if (log_pref is LogCondition.ALL_ASSIGNMENTS or
-                (log_pref is LogCondition.EXECUTION and EXECUTING in context) or
-                (log_pref is LogCondition.VALUE_ASSIGNMENT and (EXECUTING in context))):
-            # record info in log
-
-# FIX: ENCODE ALL OF THIS AS 1D ARRAYS IN 2D PROJECTION VALUE, AND PASS TO .value FOR LOGGING
-            controller.log.entries[self.name + " " +
-                                      kpIntensity] = LogEntry('time_placeholder', context, float(self.intensity))
-            if not self.ignoreIntensityFunction:
-                controller.log.entries[self.name + " " + kpAllocation] = LogEntry('time_placeholder',
-                                                                                  context,
-                                                                                  float(self.allocation))
-                controller.log.entries[self.name + " " + kpIntensityCost] =  LogEntry('time_placeholder',
-                                                                                      context,
-                                                                                      float(self.intensity_cost))
-                controller.log.entries[self.name + " " + kpAdjustmentCost] = LogEntry('time_placeholder',
-                                                                                      context,
-                                                                                      float(self.adjustment_cost))
-                controller.log.entries[self.name + " " + kpDurationCost] = LogEntry('time_placeholder',
-                                                                                    context,
-                                                                                    float(self.duration_cost))
-                controller.log.entries[self.name + " " + kpCost] = LogEntry('time_placeholder',
-                                                                            context,
-                                                                            float(self.cost))
+#         #region Record control_signal values in owner Mechanism's log
+#         # Notes:
+#         # * Log control_signals for ALL states of a given Mechanism in the Mechanism's log
+#         # * Log control_signals for EACH state in a separate entry of the Mechanism's log
+#
+#         # Get receiver Mechanism and state
+#         controller = self.owner
+#
+#         # Get logPref for Mechanism
+#         log_pref = controller.prefs.logPref
+#
+#         # Get context
+#         if not context:
+#             context = controller.name + " " + self.name + kwAssign
+#         else:
+#             context = context + SEPARATOR_BAR + self.name + kwAssign
+#
+#         # If context is consistent with log_pref:
+#         if (log_pref is LogCondition.ALL_ASSIGNMENTS or
+#                 (log_pref is LogCondition.EXECUTION and EXECUTING in context) or
+#                 (log_pref is LogCondition.VALUE_ASSIGNMENT and (EXECUTING in context))):
+#             # record info in log
+#
+# # FIX: ENCODE ALL OF THIS AS 1D ARRAYS IN 2D PROJECTION VALUE, AND PASS TO .value FOR LOGGING
+#             controller.log.entries[self.name + " " +
+#                                       kpIntensity] = LogEntry('time_placeholder', context, float(self.intensity))
+#             if not self.ignoreIntensityFunction:
+#                 controller.log.entries[self.name + " " + kpAllocation] = LogEntry('time_placeholder',
+#                                                                                   context,
+#                                                                                   float(self.allocation))
+#                 controller.log.entries[self.name + " " + kpIntensityCost] =  LogEntry('time_placeholder',
+#                                                                                       context,
+#                                                                                       float(self.intensity_cost))
+#                 controller.log.entries[self.name + " " + kpAdjustmentCost] = LogEntry('time_placeholder',
+#                                                                                       context,
+#                                                                                       float(self.adjustment_cost))
+#                 controller.log.entries[self.name + " " + kpDurationCost] = LogEntry('time_placeholder',
+#                                                                                     context,
+#                                                                                     float(self.duration_cost))
+#                 controller.log.entries[self.name + " " + kpCost] = LogEntry('time_placeholder',
+#                                                                             context,
+#                                                                             float(self.cost))
     #endregion
 
     def _parse_state_specific_specs(self, owner, state_dict, state_specific_spec):

psyneulink/globals/log.py

@@ -1237,15 +1237,27 @@ def nparray(self,
             time_col = iter(time_values)
             for datum in self.logged_entries[entry]:
                 if time_values:
-                    # for time in next(time_col,None):
-                        # if time is None:
-                        #     break
-                        # if datum.item != time:
-                        #     row.append(None)
+                # MODIFIED 12/14/17 OLD:
                     while datum.time != next(time_col,None):
                         row.append(None)
-                value = None if datum.value is None else datum.value.tolist()
+                value = None if datum.value is None else np.array(datum.value).tolist()
                 row.append(value)
+                # # MODIFIED 12/14/17 NEW:
+                #     for i in range(len(time_values)):
+                #         time = next(time_col,None)
+                #         if time is None:
+                #             break
+                #         if datum.time != time:
+                #             row.append(None)
+                #             continue
+                #         value = None if datum.value is None else datum.value.tolist()
+                #         row.append(value)
+                #         break
+                # else:
+                #     value = None if datum.value is None else datum.value.tolist()
+                #     row.append(value)
+                # MODIFIED 12/14/17 END
+
             if header:
                 entry_header = "{}{}{}{}".format(owner_name_str, lb, self._alias_owner_name(entry), rb)
                 row = [entry_header] + row