From 4de277b044300b802803a152283df6ed8e74bfec Mon Sep 17 00:00:00 2001
From: Justin Gray <justin.s.gray@gmail.com>
Date: Tue, 31 Mar 2020 21:55:20 -0400
Subject: [PATCH 1/8] added error check in connect statement

---
 pyxdsm/XDSM.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyxdsm/XDSM.py b/pyxdsm/XDSM.py
index f94a23f..06d15a5 100644
--- a/pyxdsm/XDSM.py
+++ b/pyxdsm/XDSM.py
@@ -131,6 +131,9 @@ def add_output(self, name, label, label_width=4, style='DataIO', stack=False, si
     def connect(self, src, target, label, label_width=4, style='DataInter', stack=False, faded=False):
         if src == target:
             raise ValueError('Can not connect component to itself')
+        if not isinstance(label_width, int): 
+            raise ValueError('label_width argument must be an integer')
+            
         self.connections.append(Connection(src, target, label, label_width, style, stack, faded))
 
     def add_process(self, systems, arrow=True):

From 879cf9ba6ceacc4ea99e8b7dd33e2e7dd173b30c Mon Sep 17 00:00:00 2001
From: Justin Gray <justin.s.gray@gmail.com>
Date: Wed, 1 Apr 2020 14:36:28 -0400
Subject: [PATCH 2/8] better error checking and a small fix for the spec stuff

---
 examples/kitchen_sink.pdf    | Bin 47723 -> 47763 bytes
 examples/mat_eqn_example.pdf | Bin 20147 -> 19394 bytes
 examples/mdf.pdf             | Bin 51059 -> 44006 bytes
 pyxdsm/XDSM.py               |   6 ++++--
 pyxdsm/tests/test_xdsm.py    |   1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/examples/kitchen_sink.pdf b/examples/kitchen_sink.pdf
index 5f151730083bb2216ce76d0855477dd6f336345f..8a47f0ffcf2755af060135d13c73c2b89f308009 100644
GIT binary patch
delta 5245
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
Dm526!

delta 5178
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

diff --git a/examples/mat_eqn_example.pdf b/examples/mat_eqn_example.pdf
index 22ecbf9b5ad01f13a7a1cd3f806914758a4ea5fc..f5da5b61dca5e5db1dfa5e7ebb888cae3efe721a 100644
GIT binary patch
delta 1088
zcmdlym+{ba#to|MlcRNcH=pL1sKRKv*+I`#TE#-aKp{UVi_6A_OFy6}KczG|wMapu
zASEp%HA2@=&%{8_&~ox0ZxtgW0|R4YLm*{rXsT;qqHbWIuF0kEo1fy6Sdyxs;bLWE
zfTm<}kdJ{M#3UVsu+*aB%=|nBV?9F?LsLs5GgDn7Ju{dM3K~G`6nrwvQWcC03@tPj
zvI`PRGKy0Z70RIc%=C=)3^XT4dCMyMCuIef<Z|izDHs}a>APhX6_+Sj7;)+Qq~@iU
zWGI*#TPjTc%b`&}HTZVlWdniQ@8M^ZIks*SwiaI*m3e!T-W%7@-8vqD@^`Mxc6()}
zSQ!5F{Y+0WkJCyI6sJ9}dM1-@!Vw_Au5fVjkB5>C{PWZsePo+m;su&Q9&pPWtokVB
zq@gV4xWr}x(`!?YGlEJfiv=HlzpuqzlUH>5$C5kNyUTf5IJPF#)F;mV6p+5n@y@lv
zZ1Yyh>Fyq^R!sgp&iX9&UF{dU5+_To=4_dyueZWJ;c{%GzV_ru88K#-XLHtmKe52{
zzWm*smpz+3dSrUkE!cb94ov1ao<CV=rDE3l8`ICfHj0j7*EE~0cHsTniw9RV|0!ko
zpjE%-RSoY;{{XwK=UvmpH-D_}idwobr`><6z=ExEYzwAHt(v@B|HHmlCtaESawlJP
zeR^t_^pA5kiBBGXy?Qw3V_wnj2~2;jCoisuJ+wnKZvhLBjqVH9B#x~P5A|mEv~VY#
znKR?nDY2hoXHTTh3D7W`AoAzInRO@hzW+SOv@PE1_m_s$p8Cp_f%}e#MF&r|%HL7{
zFniud-tB)r=9;?%C9M2Xt^Xz5YqP(3`RBf%A6BaO-)kK8a$fPMK5fbW10KI?-4>lc
zQD-~jE~ofkEAcm_5xcLcsGl-2>&^YY=Ciw1qTlVy|6Y3rn)fv*y4^B=c67p_<Uhq5
z3vai5d%J(*`71Vu`Oa-*zIj;fG5eN3va_b`Sg2cXcR|dkE;dKXBf2(h`Ap&FP17x3
zdsRvQmOUk_Z^4zCmr`6(l$w|eVu5mip(RpQ2&pVcRnU(JN=@U^_smO4tx$+I04B{?
zF8$!lDo`Tj(hpaNHdHWDFa(MP<>!|u7@7n12Z5BQ<trFkD8xW`E(*~$hK5e2ZYJht
zMn<k?j=*eU=<H(PW@c<?0?bWLKv6pd!b*VFKohu`g#tK%XC)^j{5XH)z)6-PXB^Hj
z9qDm6bKt~*^9)NY8)tN1{L9~QmiNdShcm}ctmAsL**Hs{>7tConZqx>H8);d-O9*t
gB8V*tGZczT5{pVIih%w$v@|d`<5E?1^>^a}0RLgEx&QzG

delta 1928
zcmah~OK#gp5Jff#z)d#U1qo^qBQ^}FyGS-afM6h!OvPh6V@S>i5WJwNmc&32HDqhx
zWWz&vF`MKL1Na7WklZ0Rm}*iVN^+9kNc~t{_4?JP|NG~`-M0t-?mfx{a7eB{8jXg*
zE<evCu#0dc4c1DgN={V<4jFU})|FW@Pa~OuT>|HF5Qoj=2Kt-;$K-X_biwlcx_4!e
zlax+_U)UZU8FD(%QS{kGG@uZZBu{&@Fp^+tLmgWwnNGnhx5qcC(^H|6fCXT%fM`LZ
z0W9#qEsX*c;1z!<4!cN`s3#Tl$yqx9b}4TZTp4Q$+EYnEV|mF-$6JFXrYV&e0Go}5
zvvhO~{S`&lmVd{Q>~@-0Q1PzC(5Lz?7D_BGj?1up!8r&a>JHepU4L#@Ha1wCK3px;
zLi6tBqpvUWHIrqIv<z*TMQJ=!Nm|PCCj3O%`{VTWyH5A8b>2lz_#_-r#!7=`k*%7|
zp=JsW$hi-$;FPUbS){Y&_+;4%XRl>E8q?OZ47z2O7awb=zn-XY5=XD5qlpCa-&69_
zJ342u4~s*#h2&!#raB4xEM(U#Vgn}G@StQ7#B>yk1Xr_CsSI`|rz15+K+ACqc6Rsu
z@afZg3ianAbl#r5xhO?&?-#+cN)dcpfNT4|)ga2XK%{~Ai3WnST5CYktTm8-&BMvY
z?aLNgSB<XZvec>xCVA)As_4nf&-qM}u+1=&MGI`_d7~akIC4l$8^md*G!gJghqG|8
zL2erCeLPU(42r_+Rx+Vm=^ifQDw!=VTXJu4(GzBai$fP#anYM472P}C+aH~0xt>9p
z9zt_coh(k{K?eQ8(?&1r;j~G%6;g#JBRzr0#m)f2s?;<q2J=X!uzwz(Udj(J8w}~E
zh7apDucLeWtn=bA`iR`;h$i<BIo@7$p6p;*hv%h>TImAJx?gup5_ca<Uk3*jjc-yp
zG^hhTgRd4iLRbQZu)s|2(Dc*`rfbaG#fTl*<r{|RTRVp6nL8NgG(0zhpwCUJPrX)w
zNdt#UY74VC4Yehv<I^(Hq1M)Gb(k=Z^0bAS78TkChUn;G+`_zFJI~|01anL5IP`5^
z!BiU3=t=3N1J;Yb&=B(ISxXWsu*Dm9G94yRR0!4UNgMi&X47pW7w7~uEP1Pa?761n
jixvtz4iKA1ur&FFP4PZtDoj<8ck~^L8+&`le+I_?;6wD|

diff --git a/examples/mdf.pdf b/examples/mdf.pdf
index 3029893296ac8f48e6a82047697236697c933829..149cf8fa7f901cd9bdda1dd7a187df0e7575e1f9 100644
GIT binary patch
delta 2064
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
I4_aaV0BOf|jsO4v

delta 9227
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
K`|j?uPU}A_;w-`d

diff --git a/pyxdsm/XDSM.py b/pyxdsm/XDSM.py
index 5f2c34d..4120c9e 100644
--- a/pyxdsm/XDSM.py
+++ b/pyxdsm/XDSM.py
@@ -89,7 +89,8 @@ def _label_to_spec(label, spec):
     if isinstance(label, str): 
         label = [label,]
     for var in label: 
-        spec.add(var)
+        if var: 
+            spec.add(var)
 
 
 System = namedtuple('System', 'node_name style label stack faded label_width spec_name')
@@ -263,7 +264,8 @@ def connect(self, src, target, label, label_width=None, style='DataInter', stack
         """
         if src == target:
             raise ValueError('Can not connect component to itself')
-        if not isinstance(label_width, int): 
+
+        if (not isinstance(label_width, int)) and (not label_width is None): 
             raise ValueError('label_width argument must be an integer')
             
         self.connections.append(Connection(src, target, label, label_width, style, stack, faded))
diff --git a/pyxdsm/tests/test_xdsm.py b/pyxdsm/tests/test_xdsm.py
index 82b3bc8..b9d382f 100644
--- a/pyxdsm/tests/test_xdsm.py
+++ b/pyxdsm/tests/test_xdsm.py
@@ -31,6 +31,7 @@ def test_examples(self):
         Unlike the other tests, this one requires LaTeX to be available.
         '''
         os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../examples'))
+
         filenames = ['kitchen_sink', 'mdf']
         for f in filenames:
             os.system('python {}.py'.format(f))

From 29b5abe6e3b6f486247b2c0fcbeba24b0a5c83aa Mon Sep 17 00:00:00 2001
From: Justin Gray <justin.s.gray@gmail.com>
Date: Wed, 1 Apr 2020 14:42:53 -0400
Subject: [PATCH 3/8] added test

---
 examples/kitchen_sink.pdf    | Bin 47763 -> 47763 bytes
 examples/mat_eqn_example.pdf | Bin 19394 -> 19394 bytes
 examples/mdf.pdf             | Bin 44006 -> 44006 bytes
 pyxdsm/tests/test_xdsm.py    |  13 +++++++++++++
 4 files changed, 13 insertions(+)

diff --git a/examples/kitchen_sink.pdf b/examples/kitchen_sink.pdf
index 8a47f0ffcf2755af060135d13c73c2b89f308009..c54e59a14aa2f5005f06910eeae807c8be0e5234 100644
GIT binary patch
delta 130
zcmbRIm1*)<rVR@=>6jQ88k(3G8XM~xn5Y{VsB3cR`{t*(B$lKqXt-Dz85kKDz?E!1
zv#E#8$<@Wh)X~7y#K^?b*vZh?z}48<+{DGw$=t}o(Z$%=PQk{JfRf3xcK!qaQ1>H`

delta 130
zcmbRIm1*)<rVR@==@=Uu8W|Y?30(sdbpr!+O)h=k{1lhOl2io^7b_zJBLf4tlFer}
x^{_cP8kxE}8=6^~J31LU8M~MnI2jr^S{k}KJ2_dJxf<9h*f<hUGI`d{p8!*2Bdq`c

diff --git a/examples/mat_eqn_example.pdf b/examples/mat_eqn_example.pdf
index f5da5b61dca5e5db1dfa5e7ebb888cae3efe721a..97af225af02b1d6d37249353223229ab54e74248 100644
GIT binary patch
delta 108
zcmX>!o$=6g#tkm+93}>ah9)M4#*=;ArQw{-`R@75&aM__M#h##E-t19CYGkgMwSMa
ZMnJ;U%*Djg&BD#lPQiwdlF5qR3jy$O8mj;R

delta 108
zcmX>!o$=6g#tkm+9LC0mMn(q4hLe5VrQw{-`R@75&W46grfw$YW=2M?W{w6%28PZq
Z25x4?h9*GuPC!vR1sg(2CM$X`1OV!b8g&2w

diff --git a/examples/mdf.pdf b/examples/mdf.pdf
index 149cf8fa7f901cd9bdda1dd7a187df0e7575e1f9..fccfa26a0412d6804b47e010bb9e75ef763d79e1 100644
GIT binary patch
delta 108
zcmaEMo$1+irVSEHI7|!-4NXi8jVCKCk%n_NJ1@y*b9OW`H8C?cvUD*uG<S1$G&FZM
bHZwCfH#T=MFm*PuaJEyhA*5vT$5meegM%H^

delta 108
zcmaEMo$1+irVSEHIE;-Ajf@P84JRusk%n_NJ1@y*b2c_Lu{1C+Gc_?ccQrF{b}=w>
bH8gg0bTcq?u{3otG`CZ*A*5vT$5meedv+bV

diff --git a/pyxdsm/tests/test_xdsm.py b/pyxdsm/tests/test_xdsm.py
index b9d382f..b723705 100644
--- a/pyxdsm/tests/test_xdsm.py
+++ b/pyxdsm/tests/test_xdsm.py
@@ -46,6 +46,19 @@ def test_examples(self):
         # change back to previous directory
         os.chdir(self.tempdir)
 
+
+    def test_connect(self): 
+        x = XDSM(use_sfmath=False)
+        x.add_system('D1', 'Function', 'D_1', label_width=2)
+        x.add_system('D2', 'Function', 'D_2', stack=False)
+
+        try: 
+            x.connect('D1', 'D2', r'\mathcal{R}(y_1)', 'foobar')
+        except ValueError as err: 
+            self.assertEquals(str(err), 'label_width argument must be an integer')
+        else: 
+            self.fail('Expected ValueError')
+
     def test_options(self):
 
         filename = 'xdsm_test_options'

From 251090e8d6672d05f36ffa67a34024e921c43cd4 Mon Sep 17 00:00:00 2001
From: Justin Gray <justin.s.gray@gmail.com>
Date: Wed, 1 Apr 2020 14:43:42 -0400
Subject: [PATCH 4/8] how did I do that?

---
 examples/mat_eqn_example.pdf | Bin 19394 -> 19394 bytes
 examples/mdf.pdf             | Bin 44006 -> 44006 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/examples/mat_eqn_example.pdf b/examples/mat_eqn_example.pdf
index 97af225af02b1d6d37249353223229ab54e74248..e2bd28e8fe3f738274e43593772e537e6b737f68 100644
GIT binary patch
delta 97
zcmX>!o$=6g#tmNX%*IA0lYQM4K=kGU_k3n2V^a$!Q!{g80}BIFb3<1%BU58DQ)5#z
W7c(P6Q!`gP1shiaN+v6MF9ZPZn;1X<

delta 97
zcmX>!o$=6g#tmNX%!bCMlYQM4K=kGU_k3n23o|2QOCuK-Qv(xAQ)44b14|<yVQS`L
UV(Dh#W@x8i<4QouWJT|V0QM*tb^rhX

diff --git a/examples/mdf.pdf b/examples/mdf.pdf
index fccfa26a0412d6804b47e010bb9e75ef763d79e1..7106eb89fb57d409a3d48f46b558bb0f57bf4567 100644
GIT binary patch
delta 98
zcmaEMo$1+irVVmSn2n7MCMzyc0MVOWmSnLx8@jj|n3!5xn3<axI=Y%0Ia#{8S{j)<
WI=VW#nK(LI+9}u&QZo7Ds;>a6q8xqz

delta 98
zcmaEMo$1+irVVmSm<^3hCMzyc0MVOWmSnLxI~tjqn3)?{x|kZ8yE!`=nmZetnVFj#
Wo4Xj8I-6KH+bP%(QZo7Ds;>Z<h#TSn


From 69f3188d1ec84eb4066770008fd43a6f811cd41e Mon Sep 17 00:00:00 2001
From: Justin Gray <justin.s.gray@gmail.com>
Date: Wed, 1 Apr 2020 17:42:06 -0400
Subject: [PATCH 5/8] added better doc string

---
 pyxdsm/XDSM.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pyxdsm/XDSM.py b/pyxdsm/XDSM.py
index 4120c9e..a80e6a1 100644
--- a/pyxdsm/XDSM.py
+++ b/pyxdsm/XDSM.py
@@ -548,7 +548,18 @@ def write(self, file_name, build=True, cleanup=True, quiet=False):
 
     def write_sys_specs(self, folder_name): 
         """
-        Write i/o spec files for components to specified folder
+        Write I/O spec json files for systems to specified folder
+
+        An I/O spec of a system is the collection of all variables going into and out of it. 
+        That includes any variables being passed between systems, as well as all inputs and outputs. 
+        This information is useful for comparing implementations (such as components and groups in OpenMDAO)
+        to the XDSM diagrams. 
+
+        The json spec files can be used to write testing utilities that compare the inputs/outputs of an implementation 
+        to the XDSM, and thus allow you to verify that your codes match the XDSM diagram precisely. 
+        This technique is especially useful when large engineering teams are collaborating on 
+        model development. It allows them to use the XDSM as a shared contract between team members 
+        so everyone can be sure that their codes will sync up.  
 
         Parameters
         ----------

From fc43621983b861189b247f1d967ee181a8b36631 Mon Sep 17 00:00:00 2001
From: Justin Gray <justin.s.gray@gmail.com>
Date: Wed, 27 May 2020 20:23:56 -0400
Subject: [PATCH 6/8] fixed bug in stacked systems

---
 pyxdsm/XDSM.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyxdsm/XDSM.py b/pyxdsm/XDSM.py
index a80e6a1..b771e58 100644
--- a/pyxdsm/XDSM.py
+++ b/pyxdsm/XDSM.py
@@ -325,7 +325,7 @@ def _build_node_grid(self):
                 style += ',faded'
 
             label = _parse_label(comp.label, comp.label_width)
-            node = node_str.format(style=comp.style, node_name=comp.node_name, node_label=label)
+            node = node_str.format(style=style, node_name=comp.node_name, node_label=label)
             grid[i_row, j_col] = node
 
             row_idx_map[comp.node_name] = i_row

From 9e643827efd49eb9286e3f3de9ef0cda1d8c0d00 Mon Sep 17 00:00:00 2001
From: Justin Gray <justin.s.gray@gmail.com>
Date: Wed, 27 May 2020 20:35:48 -0400
Subject: [PATCH 7/8] added test

---
 pyxdsm/tests/test_xdsm.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pyxdsm/tests/test_xdsm.py b/pyxdsm/tests/test_xdsm.py
index b723705..72ee24f 100644
--- a/pyxdsm/tests/test_xdsm.py
+++ b/pyxdsm/tests/test_xdsm.py
@@ -3,6 +3,13 @@
 from pyxdsm.XDSM import XDSM, __file__
 from numpy.distutils.exec_command import find_executable
 
+
+def filter_lines(lns):
+    # Empty lines are excluded.
+    # Leading and trailing whitespaces are removed
+    # Comments are removed.
+    return [ln.strip() for ln in lns if ln.strip() and not ln.strip().startswith('%')]
+
 class TestXDSM(unittest.TestCase):
 
     def setUp(self):
@@ -102,6 +109,24 @@ def test_options(self):
         self.assertTrue(os.path.isfile(os.path.join(spec_dir, 'F.json')))
         self.assertTrue(os.path.isfile(os.path.join(spec_dir, 'G_spec.json')))
 
+
+    def test_stacked_system(self): 
+
+        x = XDSM()
+
+        x.add_system('test', 'Optimization', r'\text{test}', stack=True)
+
+        file_name = "stacked_test"
+        x.write(file_name)
+
+        tikz_file = file_name + '.tikz'
+        with open(tikz_file, "r") as f:
+            tikz = f.read()
+
+        self.assertIn(r"\node [Optimization,stack]", tikz)
+
+
+
     def test_tikz_content(self):
         # Check if TiKZ file was created.
         # Compare the content of the sample below and the newly created TiKZ file.
@@ -222,12 +247,6 @@ def test_tikz_content(self):
             
             \end{tikzpicture}"""
 
-        def filter_lines(lns):
-            # Empty lines are excluded.
-            # Leading and trailing whitespaces are removed
-            # Comments are removed.
-            return [ln.strip() for ln in lns if ln.strip() and not ln.strip().startswith('%')]
-
         filename = 'xdsm_test_tikz'
 
         x = XDSM(use_sfmath=True)

From 9f22bc04be3de3b674f0036d558137472443d38c Mon Sep 17 00:00:00 2001
From: "Justin S. Gray" <justin.s.gray@gmail.com>
Date: Mon, 31 Aug 2020 14:08:14 -0400
Subject: [PATCH 8/8] adding constants for the diagram styles

---
 README.md                    |  18 +++++++-----------
 examples/kitchen_sink.pdf    | Bin 47763 -> 47843 bytes
 examples/kitchen_sink.py     |   3 ++-
 examples/mat_eqn_example.pdf | Bin 19394 -> 19394 bytes
 examples/mdf.pdf             | Bin 44006 -> 44006 bytes
 examples/mdf.py              |  18 +++++++-----------
 pyxdsm/XDSM.py               |  10 ++++++++++
 pyxdsm/tests/test_xdsm.py    |  32 ++++++++++++++++----------------
 8 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 9675e79..27c5300 100644
--- a/README.md
+++ b/README.md
@@ -41,20 +41,16 @@ You need to install these libraries for pyXDSM to work. See the [install guide](
 ## How do I use it?
 Here is a simple example. There are some other more advanced things you can do as well. Check out the [examples folder](https://github.com/mdolab/pyXDSM/blob/master/examples)
 ```python
-from pyxdsm.XDSM import XDSM
-
-opt = 'Optimization'
-solver = 'MDA'
-func = 'Function'
+from pyxdsm.XDSM import XDSM, OPT, SOLVER, FUNC
 
 x = XDSM()
 
-x.add_system('opt', opt, r'\text{Optimizer}')
-x.add_system('solver', solver, r'\text{Newton}')
-x.add_system('D1', func, 'D_1')
-x.add_system('D2', func, 'D_2')
-x.add_system('F', func, 'F')
-x.add_system('G', func, 'G')
+x.add_system('opt', OPT, r'\text{Optimizer}')
+x.add_system('solver', SOLVER, r'\text{Newton}')
+x.add_system('D1', FUNC, 'D_1')
+x.add_system('D2', FUNC, 'D_2')
+x.add_system('F', FUNC, 'F')
+x.add_system('G', FUNC, 'G')
 
 x.connect('opt', 'D1', 'x, z')
 x.connect('opt', 'D2', 'z')
diff --git a/examples/kitchen_sink.pdf b/examples/kitchen_sink.pdf
index c54e59a14aa2f5005f06910eeae807c8be0e5234..4380930dcf03631ce810a43c1558876290214a1e 100644
GIT binary patch
delta 4885
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
HMNdWwbqH9{

delta 4771
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

diff --git a/examples/kitchen_sink.py b/examples/kitchen_sink.py
index cc2ca6d..d19797a 100644
--- a/examples/kitchen_sink.py
+++ b/examples/kitchen_sink.py
@@ -1,4 +1,5 @@
-from pyxdsm.XDSM import XDSM
+from pyxdsm.XDSM import (XDSM, OPT, SUBOPT, SOLVER, DOE, 
+                         IFUNC, FUNC, GROUP, IGROUP, METAMODEL)
 
 # styling names for the boxes
 opt = 'Optimization'
diff --git a/examples/mat_eqn_example.pdf b/examples/mat_eqn_example.pdf
index e2bd28e8fe3f738274e43593772e537e6b737f68..f2baa8c95b2b049810835934002ce1e23ba90820 100644
GIT binary patch
delta 162
zcmX>!o$=6g#tqW$OhyKiW!=>|EsPBfO$;my3?}=!OCj+J+`~1E3=}j%QX>?6GRsmG
zj0_AdH5IZ85=%0QQxg@+Qj3Z+^YawU^o;ckH-B({$K+({=wxZ&XliO~U}<V<V(x5Y
c;$~rJVQy*R>gHnP;_PatU_(I3WCia<07@?_x&QzG

delta 162
zcmX>!o$=6g#tqW$Ooo<|W!=>|O$-bTO-zi9OeXufOCj+J+`}~uEfq9EQX>?6GRsmG
zj0_AdG!?Q75=%0QQxg@+Qj3Z+^YawU^o;ckHh*w`$K>Q{Y--_TYG!V1U}0ctZs=-e
cWNK_?YHVueVrFD$YUXOEU_(I3WCia<063K@_y7O^

diff --git a/examples/mdf.pdf b/examples/mdf.pdf
index 7106eb89fb57d409a3d48f46b558bb0f57bf4567..765f55822d0a15f1c27deccb9f4b733f438bc4b9 100644
GIT binary patch
delta 163
zcmaEMo$1+irVZ~GGZ`67{<v73)56%$(8R#p)N-=o5-B8}%aU+SBLfAEkkkkTpUkpU
z1tSAPOHGCBg2a-H;?zWivecsD%=|nBGd*KH!_7yQykd2BHgR#bbaHjJv@|qzHZ*fG
dadt9ru`n@lGc$LwFf(znQ?MbVWb(&VUjfCAF|z;w

delta 163
zcmaEMo$1+irVZ~GGZ|V={<v73)5O5g(8R>p*kH2a5-B8}%aU+SLrVpXkkkkTpUkpU
z1tSAP3r&UWg2a-H;?zWivecsD%=|nBGd*KHgUv^lykd1Wba68<F}1WXGdD4GbTv0}
dvUGK|G%|N|baiwyadft{Q?MbVWb(&VUjeY8F_!=U

diff --git a/examples/mdf.py b/examples/mdf.py
index 8d6f99b..f5ac147 100644
--- a/examples/mdf.py
+++ b/examples/mdf.py
@@ -1,18 +1,14 @@
-from pyxdsm.XDSM import XDSM
-
-opt = 'Optimization'
-solver = 'MDA'
-func = 'Function'
+from pyxdsm.XDSM import XDSM, OPT, SOLVER, FUNC
 
 # Change `use_sfmath` to False to use computer modern
 x = XDSM(use_sfmath=True)
 
-x.add_system('opt', opt, r'\text{Optimizer}')
-x.add_system('solver', solver, r'\text{Newton}')
-x.add_system('D1', func, 'D_1')
-x.add_system('D2', func, 'D_2')
-x.add_system('F', func, 'F')
-x.add_system('G', func, 'G')
+x.add_system('opt', OPT, r'\text{Optimizer}')
+x.add_system('solver', SOLVER, r'\text{Newton}')
+x.add_system('D1', FUNC, 'D_1')
+x.add_system('D2', FUNC, 'D_2')
+x.add_system('F', FUNC, 'F')
+x.add_system('G', FUNC, 'G')
 
 x.connect('opt', 'D1', 'x, z')
 x.connect('opt', 'D2', 'z')
diff --git a/pyxdsm/XDSM.py b/pyxdsm/XDSM.py
index b771e58..0413bd6 100644
--- a/pyxdsm/XDSM.py
+++ b/pyxdsm/XDSM.py
@@ -7,6 +7,16 @@
 
 from pyxdsm import __version__ as pyxdsm_version
 
+OPT = 'Optimization'
+SUBOPT = 'SubOptimization'
+SOLVER = 'MDA'
+DOE = 'DOE'
+IFUNC = 'ImplicitFunction'
+FUNC = 'Function'
+GROUP = 'Group'
+IGROUP = 'ImplicitGroup'
+METAMODEL = 'Metamodel'
+
 tikzpicture_template = r"""
 %%% Preamble Requirements %%%
 % \usepackage{{geometry}}
diff --git a/pyxdsm/tests/test_xdsm.py b/pyxdsm/tests/test_xdsm.py
index 72ee24f..51233f7 100644
--- a/pyxdsm/tests/test_xdsm.py
+++ b/pyxdsm/tests/test_xdsm.py
@@ -1,6 +1,6 @@
 import unittest
 import os
-from pyxdsm.XDSM import XDSM, __file__
+from pyxdsm.XDSM import XDSM, __file__, OPT, FUNC, SOLVER
 from numpy.distutils.exec_command import find_executable
 
 
@@ -56,8 +56,8 @@ def test_examples(self):
 
     def test_connect(self): 
         x = XDSM(use_sfmath=False)
-        x.add_system('D1', 'Function', 'D_1', label_width=2)
-        x.add_system('D2', 'Function', 'D_2', stack=False)
+        x.add_system('D1', FUNC, 'D_1', label_width=2)
+        x.add_system('D2', FUNC, 'D_2', stack=False)
 
         try: 
             x.connect('D1', 'D2', r'\mathcal{R}(y_1)', 'foobar')
@@ -74,12 +74,12 @@ def test_options(self):
         # Change `use_sfmath` to False to use computer modern
         x = XDSM(use_sfmath=False)
 
-        x.add_system('opt', 'Optimization', r'\text{Optimizer}')
-        x.add_system('solver', 'MDA', r'\text{Newton}')
-        x.add_system('D1', 'Function', 'D_1', label_width=2)
-        x.add_system('D2', 'Function', 'D_2', stack=False)
-        x.add_system('F', 'Function', 'F', faded=True)
-        x.add_system('G', 'Function', 'G', spec_name="G_spec")
+        x.add_system('opt', OPT, r'\text{Optimizer}')
+        x.add_system('solver', SOLVER, r'\text{Newton}')
+        x.add_system('D1', FUNC, 'D_1', label_width=2)
+        x.add_system('D2', FUNC, 'D_2', stack=False)
+        x.add_system('F', FUNC, 'F', faded=True)
+        x.add_system('G', FUNC, 'G', spec_name="G_spec")
 
         x.connect('opt', 'D1', 'x, z')
         x.connect('opt', 'D2', 'z')
@@ -114,7 +114,7 @@ def test_stacked_system(self):
 
         x = XDSM()
 
-        x.add_system('test', 'Optimization', r'\text{test}', stack=True)
+        x.add_system('test', OPT, r'\text{test}', stack=True)
 
         file_name = "stacked_test"
         x.write(file_name)
@@ -251,12 +251,12 @@ def test_tikz_content(self):
 
         x = XDSM(use_sfmath=True)
 
-        x.add_system('opt', 'Optimization', r'\text{Optimizer}')
-        x.add_system('solver', 'MDA', r'\text{Newton}')
-        x.add_system('D1', 'Function', 'D_1')
-        x.add_system('D2', 'Function', 'D_2')
-        x.add_system('F', 'Function', 'F')
-        x.add_system('G', 'Function', 'G')
+        x.add_system('opt', OPT, r'\text{Optimizer}')
+        x.add_system('solver', SOLVER, r'\text{Newton}')
+        x.add_system('D1', FUNC, 'D_1')
+        x.add_system('D2', FUNC, 'D_2')
+        x.add_system('F', FUNC, 'F')
+        x.add_system('G', FUNC, 'G')
 
         x.connect('opt', 'D1', 'x, z')
         x.connect('opt', 'D2', 'z')