From 10e024b6a19fff8e4954acfac392c4dc058f64a8 Mon Sep 17 00:00:00 2001 From: LPTK Date: Fri, 14 Jun 2013 17:21:08 +0200 Subject: [PATCH] removed useless inheritance --- mo/src/neighborhood/moRealNeighbor.h | 25 +++++++++++++++++ mo/src/neighborhood/moRealNeighborhood.h | 35 ++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/mo/src/neighborhood/moRealNeighbor.h b/mo/src/neighborhood/moRealNeighbor.h index 4af8924f2..e4a4a18d6 100644 --- a/mo/src/neighborhood/moRealNeighbor.h +++ b/mo/src/neighborhood/moRealNeighbor.h @@ -1,3 +1,28 @@ +/* + +(c) Thales group, 2010 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; + version 2 of the License. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Contact: http://eodev.sourceforge.net + +Authors: +Lionel Parreaux + +*/ + #ifndef __moRealNeighbor_h__ #define __moRealNeighbor_h__ diff --git a/mo/src/neighborhood/moRealNeighborhood.h b/mo/src/neighborhood/moRealNeighborhood.h index 5efa3ec6f..e839d16fa 100644 --- a/mo/src/neighborhood/moRealNeighborhood.h +++ b/mo/src/neighborhood/moRealNeighborhood.h @@ -1,3 +1,27 @@ +/* + +(c) Thales group, 2010 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; + version 2 of the License. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Contact: http://eodev.sourceforge.net + +Authors: +Lionel Parreaux + +*/ #ifndef __moRealNeighborhood_h__ #define __moRealNeighborhood_h__ @@ -7,7 +31,7 @@ #include "neighborhood/moRealNeighbor.h" template -class moRealNeighborhood : public moRndNeighborhood< Neighbor >, public eoFunctorBase +class moRealNeighborhood : public moRndNeighborhood< Neighbor > { public: typedef typename Distrib::EOType EOT; @@ -19,7 +43,14 @@ protected: public: - moRealNeighborhood( Distrib & distrib, edoSampler & sampler, edoBounder & bounder ) : _distrib(distrib), _sampler(sampler), _bounder(bounder) {} + moRealNeighborhood( + Distrib& distrib, + edoSampler& sampler, + edoBounder& bounder + ): _distrib(distrib), + _sampler(sampler), + _bounder(bounder) + { } /** * It alway remains at least a solution in an infinite neighborhood