From 851e63476ce7ca186c97bb1e6a68ed420f35f715 Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Tue, 13 May 2014 12:53:42 +0100 Subject: [PATCH] [pydot] build pydot with new observer list --- GPy/core/parameterization/lists_and_dicts.py | 1 + GPy/core/parameterization/param.py | 4 ++-- GPy/core/parameterization/parameterized.py | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/GPy/core/parameterization/lists_and_dicts.py b/GPy/core/parameterization/lists_and_dicts.py index 13547c94..64bdb077 100644 --- a/GPy/core/parameterization/lists_and_dicts.py +++ b/GPy/core/parameterization/lists_and_dicts.py @@ -57,6 +57,7 @@ class ObservablesList(object): def __repr__(self): return self._poc.__repr__() + def add(self, priority, observable, callble): if observable is not None: diff --git a/GPy/core/parameterization/param.py b/GPy/core/parameterization/param.py index 19e48d84..91bf3561 100644 --- a/GPy/core/parameterization/param.py +++ b/GPy/core/parameterization/param.py @@ -57,9 +57,9 @@ class Param(OptimizationHandlable, ObsAr): def build_pydot(self,G): import pydot - node = pydot.Node(id(self), shape='record', label=self.name) + node = pydot.Node(id(self), shape='trapezium', label=self.name)#, fontcolor='white', color='white') G.add_node(node) - for o in self.observers.keys(): + for _, o, _ in self.observers: label = o.name if hasattr(o, 'name') else str(o) observed_node = pydot.Node(id(o), label=label) G.add_node(observed_node) diff --git a/GPy/core/parameterization/parameterized.py b/GPy/core/parameterization/parameterized.py index 738f0485..67694a1b 100644 --- a/GPy/core/parameterization/parameterized.py +++ b/GPy/core/parameterization/parameterized.py @@ -82,15 +82,15 @@ class Parameterized(Parameterizable): import pydot # @UnresolvedImport iamroot = False if G is None: - G = pydot.Dot(graph_type='digraph') + G = pydot.Dot(graph_type='digraph', bgcolor=None) iamroot=True - node = pydot.Node(id(self), shape='record', label=self.name) + node = pydot.Node(id(self), shape='box', label=self.name)#, color='white') G.add_node(node) for child in self._parameters_: child_node = child.build_pydot(G) - G.add_edge(pydot.Edge(node, child_node)) + G.add_edge(pydot.Edge(node, child_node))#, color='white')) - for o in self.observers.keys(): + for _, o, _ in self.observers: label = o.name if hasattr(o, 'name') else str(o) observed_node = pydot.Node(id(o), label=label) G.add_node(observed_node)