Merge #597
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 07 Oct 2015 18:49:46 +0200
changeset 11549b4503108cc0
parent 1150 df2d4bf31fcb
parent 1153 233ad6942a26
child 1155 9fd86ec2cb81
Merge #597
     1.1 --- a/doc/groups.dox	Tue Sep 22 18:20:15 2015 +0200
     1.2 +++ b/doc/groups.dox	Wed Oct 07 18:49:46 2015 +0200
     1.3 @@ -585,7 +585,7 @@
     1.4  In addition, the graph nodes may be \e labeled, i.e. we are given two
     1.5  node labelings \f$l_1:V_1\longrightarrow L\f$ and \f$l_2:V_2\longrightarrow
     1.6  L\f$ and we require that \f$l_1(u)=l_2(f(u))\f$ holds for all nodes \f$u \in
     1.7 -G\f$.
     1.8 +G_1\f$.
     1.9  
    1.10  */
    1.11  
     2.1 --- a/doc/references.bib	Tue Sep 22 18:20:15 2015 +0200
     2.2 +++ b/doc/references.bib	Wed Oct 07 18:49:46 2015 +0200
     2.3 @@ -356,15 +356,14 @@
     2.4  }
     2.5  
     2.6  @article{cordella2004sub,
     2.7 -  title =	 {A (sub) graph isomorphism algorithm for matching
     2.8 +  author =       {Cordella, Luigi P. and Foggia, Pasquale and Sansone,
     2.9 +                  Carlo and Vento, Mario},
    2.10 +  title =        {A (sub)graph isomorphism algorithm for matching
    2.11                    large graphs},
    2.12 -  author =	 {Cordella, Luigi P and Foggia, Pasquale and Sansone,
    2.13 -                  Carlo and Vento, Mario},
    2.14 -  journal =	 {Pattern Analysis and Machine Intelligence, IEEE
    2.15 -                  Transactions on},
    2.16 -  volume =	 26,
    2.17 -  number =	 10,
    2.18 -  pages =	 {1367--1372},
    2.19 -  year =	 2004,
    2.20 -  publisher =	 {IEEE}
    2.21 +  journal =      {IEEE Transactions on Pattern Analysis and Machine
    2.22 +                  Intelligence},
    2.23 +  volume =       26,
    2.24 +  number =       10,
    2.25 +  pages =        {1367--1372},
    2.26 +  year =         2004
    2.27  }
     3.1 --- a/lemon/vf2.h	Tue Sep 22 18:20:15 2015 +0200
     3.2 +++ b/lemon/vf2.h	Wed Oct 07 18:49:46 2015 +0200
     3.3 @@ -428,7 +428,7 @@
     3.4      ///\sa See \ref Vf2MappingType for the possible values.
     3.5      void mappingType(Vf2MappingType m_type) { _mapping_type = m_type; }
     3.6  
     3.7 -    ///Find a mapping
     3.8 +    ///Finds a mapping
     3.9  
    3.10      ///It finds a mapping between from g1 into g2 according to the mapping
    3.11      ///type set by \ref mappingType(Vf2MappingType) "mappingType()".