Fixed a bug in \graph_remove_vertex and added \graph_vertex_count.

mhelvens · Apr 21, 2014 · b14439b · b14439b
1 parent 6208b85
commit b14439b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 latex-lt3graph
 =============
 
-LaTeX Package : lt3graph 0.1.2
+LaTeX Package : lt3graph 0.1.3
 
-Last Modified : 2014-04-14
+Last Modified : 2014-04-21
 
 Author        : Michiel Helvensteijn  (www.mhelvens.net)
 

diff --git a/archive b/archive
@@ -11,7 +11,7 @@ FILES="$DOC.sty         \
        $DOC-packagedoc.cls  \
        README.md"
 
-VERSION=0.1.2
+VERSION=0.1.3
 
 ##################################################
 #

diff --git a/lt3graph.sty b/lt3graph.sty
@@ -48,7 +48,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\ProvidesExplPackage{lt3graph}{2014/04/14}{0.1.2}
+\ProvidesExplPackage{lt3graph}{2014/04/21}{0.1.3}
   {a LaTeX3 datastructure for representing directed graphs with data}
 %    \end{macrocode}
 %
@@ -201,7 +201,7 @@
 \cs_new_protected:Nn \__graph_ptr_gnew:Nn {
   \withargs [\uniquecsname] {
     \tl_gset:Nn #1 {##1}
-    \tl_new:c     {##1}
+    \tl_new:c      {##1}
     \tl_gset:cn    {##1} {#2}
   }
 }
@@ -228,6 +228,7 @@
   }{
     \tl_new:N #1
     \tl_set:Nf #1 { \tl_trim_spaces:f {\str_tail:n{#1}} }
+    \int_new:c {\__graph_tl:nnn{graph}{#1}{vertex-count}}
     \__graph_for_each_prop_datatype:n
       { \prop_new:c {\__graph_tl:nnn{graph}{#1}{##1}} }
   }
@@ -343,13 +344,17 @@
   {
     %%% create pointer to value
     %
-    \use:c {__graph_ptr_#4new:Nn} \l__graph_vertex_data_tl {#3}
+    \use:c{__graph_ptr_#4new:Nn} \l__graph_vertex_data_tl {#3}
 
     %%% add the vertex
     %
-    \use:c {prop_#4put:cnV} {\__graph_tl:nnn{graph}{#1}{vertices}}
+    \use:c{prop_#4put:cnV} {\__graph_tl:nnn{graph}{#1}{vertices}}
         {#2} \l__graph_vertex_data_tl
 
+    %%% increment the vertex counter
+    %
+    \use:c{int_#4incr:c}  {\__graph_tl:nnn{graph}{#1}{vertex-count}}
+
     \graph_get_vertex:NnNT #1 {#2} \l_tmpa_tl {
       %%% initialize degree to 0
       %
@@ -464,9 +469,13 @@
 
       %%% remove the vertex
       %
-      \use{prop_#3remove:cn} {\__graph_tl:nnn{graph}{#1}{vertices}}  {#2}
-      \use{prop_#3remove:cn} {\__graph_tl:nnn{graph}{#1}{indegree}}  {#2}
-      \use{prop_#3remove:cn} {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2}
+      \use:c{prop_#3remove:cn} {\__graph_tl:nnn{graph}{#1}{vertices}}  {#2}
+      \use:c{prop_#3remove:cn} {\__graph_tl:nnn{graph}{#1}{indegree}}  {#2}
+      \use:c{prop_#3remove:cn} {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2}
+
+      %%% decrement the vertex counter
+      %
+      \use:c{int_#3decr:c} {\__graph_tl:nnn{graph}{#1}{vertex-count}}
     }
   }
 \cs_generate_variant:Nn \prop_put:Nnn {cnV}
@@ -807,6 +816,20 @@
 
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  Get the number of vertices in the graph:
+%
+%    \begin{macrocode}
+\cs_new:Nn \graph_vertex_count:N {
+  \int_use:c {\__graph_tl:nnn{graph}{#1}{vertex-count}}
+}
+%    \end{macrocode}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Get the number of edges leading out of vertex |#2|:

diff --git a/lt3graph.tex b/lt3graph.tex
@@ -95,6 +95,10 @@
   {allowing \texttt{\textbackslash graph_map_topological_order_\ldots}
    to be nested}
 
+\changes{0.1.3}{2014/04/21}
+  {fixed a bug in \texttt{\textbackslash graph_remove_vertex} and
+   added a \texttt{\textbackslash graph_vertex_count:N} function}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document}                                                               %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%