Added that \factor can have inputs and outputs

Author: jluttine

example.tex

@@ -70,7 +70,7 @@
         \node[obs] (y) {$y$} ; %
         \node[latent, left=of y, yshift=0.5cm] (mu) {$\mu$} ; %
         \node[latent, left=of y, yshift=-0.5cm] (tau) {$\tau$} ; %
-        \factor[left=of y] {y-factor} {$\mathcal{N}$} ;
+        \factor[left=of y] {y-factor} {$\mathcal{N}$} {} {};
         \factoredge {mu,tau} {y-factor} {y} ; %
       }
       \\
@@ -87,10 +87,11 @@
         % Nodes
         \node[obs]                    (k)   {$k$}; %
         \node[latent, above=2 of k]   (l)   {$\lambda$}; %
-        \factor[above=0.8 of k]       {k-f} {Multi} ; %
-        \node[latent, right=of k-f]   (p)   {$\phi$}; %
+        \factor[above=0.8 of k]       {k-f} {Multi} {} {}; %
+        \node[latent, right=of k-f]   (paa) {$\phi$}; %
+        %\node[latent, right=of k-f]   (p)   {$\phi$}; %
         % Connections
-        \factoredge {p} {k-f} {k} ; %
+        \factoredge {paa} {k-f} {k} ; %
         % Gate
         \gate {} {(k-f)(k-f-caption)} {l} ; %
       }

model_citation_influence.tex

@@ -36,17 +36,17 @@
     \\
     & %
     & %
-    \factor       {T-f1}   {Multi} ; & %
+    \factor       {T-f1}   {Multi} {} {}; & %
     & %
-    \factor       {T-f2}   {below:Multi} ; & %
+    \factor       {T-f2}   {below:Multi} {} {}; & %
     \\
     \node[latent] (T')     {$T'$} ; & %
     & %
     \node[latent] (T)      {$T$} ; & %
     \\
-    \factor       {W'-f}   {Multi} ; & %
+    \factor       {W'-f}   {Multi} {} {}; & %
     \node[latent] (phi)    {$\phi$} ; & %
-    \factor       {W-f}    {Multi} ; %
+    \factor       {W-f}    {Multi} {} {}; %
     \\
     \node[obs] (W')        {$W'$} ; & %
     & %
@@ -55,14 +55,14 @@
   };
 
   % Remaining factors
-  \factor[above=of T']     {T'-f}     {left:Multi} ; %
-  \factor[above=of theta]  {theta-f}  {left:Dir} ; %
-  \factor[above=of C]      {C-f}      {left:Multi} ; %
-  \factor[above=of S]      {S-f}      {left:Bern} ; %
-  \factor[above=of gamma]  {gamma-f}  {left:Dir} ; %
-  \factor[above=of lambda] {lambda-f} {left:Beta} ; %
-  \factor[above=of psi]    {psi-f}    {left:Dir} ; %
-  \factor[above=of phi]    {phi-f}    {left:Dir} ; %
+  \factor[above=of T']     {T'-f}     {left:Multi} {} {}; %
+  \factor[above=of theta]  {theta-f}  {left:Dir} {} {}; %
+  \factor[above=of C]      {C-f}      {left:Multi} {} {}; %
+  \factor[above=of S]      {S-f}      {left:Bern} {} {}; %
+  \factor[above=of gamma]  {gamma-f}  {left:Dir} {} {}; %
+  \factor[above=of lambda] {lambda-f} {left:Beta} {} {}; %
+  \factor[above=of psi]    {psi-f}    {left:Dir} {} {}; %
+  \factor[above=of phi]    {phi-f}    {left:Dir} {} {}; %
 
   % Hyperparameters
   \node[const, above=of theta]  (atheta)  {$\alpha_\theta$}; %

model_lda.tex

@@ -24,15 +24,15 @@
 
 
   % Factors
-  \factor[above=of X]     {X-f}     {Multi} ; %
-  \factor[above=of T]     {T-f}     {left:Multi} ; %
-  \factor[above=of theta] {theta-f} {left:Dir} ; %
+  \factor[above=of X]     {X-f}     {Multi} {} {} ; %
+  \factor[above=of T]     {T-f}     {left:Multi} {} {} ; %
+  \factor[above=of theta] {theta-f} {left:Dir} {} {} ; %
 
   % More nodes
   \node[latent, right=of X-f] (phi)  {$\phi$}; %
   \node[const, above=of phi]  (aphi) {$\alpha_\phi$}; %
 
-  \factor[above=of phi] {phi-f} {right:Dir} ; %
+  \factor[above=of phi] {phi-f} {right:Dir} {} {} ; %
 
   \factoredge {theta}  {T-f}     {T} ; %
   \factoredge {atheta} {theta-f} {theta} ; %

model_pca.tex

@@ -15,10 +15,10 @@
 \begin{tikzpicture}
 
   % Define nodes
-  \node[obs]                             (y) {$y$};
+  \node[obs]                               (y) {$y$};
   \node[latent, above=of y, xshift=-1.2cm] (w) {$\mathbf{w}$};
   \node[latent, above=of y, xshift=1.2cm]  (x) {$\mathbf{x}$};
-  \node[latent, right=2cm of y]              (t) {$\tau$};
+  \node[latent, right=2cm of y]            (t) {$\tau$};
 
   % Connect the nodes
   \edge {x,w,t} {y} ; %

model_pca2.tex

@@ -29,18 +29,19 @@
   % W hyper
   \node[const, above=1.2 of w, xshift=-0.5cm] (mw) {$\mu_w$} ; %
   \node[const, above=1.2 of w, xshift=0.5cm]  (aw) {$\alpha_w$} ; %
-  \factor[above=of w] {w-f} {left:$\mathcal{N}$} ; %
+  \factor[above=of w] {w-f} {left:$\mathcal{N}$} {} {} ; %
   \factoredge {mw,aw} {w-f} {w} ;
 
   % X hyper
   \node[const, above=1.2 of x, xshift=-0.5cm] (mx) {$\mu_x$} ; %
   \node[const, above=1.2 of x, xshift=0.5cm]  (ax) {$\alpha_x$} ; %
-  \factor[above=of x] {x-f} {left:$\mathcal{N}$} ; %
+  \factor[above=of x] {x-f} {left:$\mathcal{N}$} {} {} ; %
   \factoredge {mx,ax} {x-f} {x} ;
 
   % noise
   \node[latent, right=3cm of y-f]         (t)   {$\tau$}; %
-  \factor[above=of t]                     {t-f} {left:$\mathcal{G}$}; %
+  \factor[above=of t]                     {t-f} {left:$\mathcal{G}$}
+  {} {} ; %
   \node[const, above=of t, xshift=-0.5cm] (at)  {$\alpha_\tau$} ; %
   \node[const, above=of t, xshift=0.5cm]  (bt)  {$\beta_\tau$} ; %
   \factoredge {at,bt} {t-f} {t} ; %

tikzlibrarybayesnet.code.tex

@@ -38,7 +38,7 @@
 \tikzstyle{const} = [rectangle, inner sep=0pt, node distance=1]
 % Factor node
 \tikzstyle{factor} = [rectangle, fill=black,minimum size=5pt, inner
-sep=0pt, node distance=0.4, font=\small]
+sep=0pt, node distance=0.4]
 % Deterministic node
 \tikzstyle{det} = [latent, diamond]
 
@@ -67,13 +67,12 @@
   % Connect all nodes #2 to all nodes #4 via all factors #3.
   \foreach \f in {#3} { %
     \foreach \x in {#2} { %
-      \draw[-,#1] (\x) edge[-] (\f) ;%
+      \draw[-,#1] (\x) edge[-] (\f) ; %
     } ;
     \foreach \y in {#4} { %
-      \draw[->,#1] (\f) -- (\y) ;%
+      \draw[->,#1] (\f) -- (\y) ; %
     } ;
   } ;
-  %\draw[<-,#1] (#2) -- (#2-factor) edge[-] (#3) ;
 }
 
 % \edge [options] {inputs} {outputs}
@@ -89,10 +88,11 @@
 % \factor [options] {name} {caption} {inputs} {outputs}
 \newcommand{\factor}[5][]{ %
   % Draw the factor node. Use alias to allow empty names.
-  \node[factor, label={[name=#2-caption]#3}, name=#2, alias=#2-alias,
-  #1] {} ; %
+  \node[factor, label={[name=#2-caption]#3}, #1] (#2) {} ; %
+  %\node[factor, label={[name=#2-caption]#3}, name=#2, #1,
+  %alias=#2-alias] {} ; %
   % Connect all inputs to outputs via this factor
-  \factoredge {#4} {#2-alias} {#5} ; %
+  %\factoredge {#4} {#2-alias} {#5} ; %
 }
 
 % \plate [options] {name} {fitlist} {caption}