From bc6b301c7d2188bcc8ab618ca2564f97bb29dacb Mon Sep 17 00:00:00 2001 From: khouadjia Date: Wed, 11 Mar 2009 15:08:07 +0000 Subject: [PATCH] New approach for Dynamic Vehicle Routing Problem based on Particle Swarm Optimization git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1511 331e1502-861f-0410-8da2-ba01fb791d7f --- .../branches/PSO-DVRP/eoPsoDVRPEncodeSwarm.h | 214 ------------------ 1 file changed, 214 deletions(-) delete mode 100644 contribution/branches/PSO-DVRP/eoPsoDVRPEncodeSwarm.h diff --git a/contribution/branches/PSO-DVRP/eoPsoDVRPEncodeSwarm.h b/contribution/branches/PSO-DVRP/eoPsoDVRPEncodeSwarm.h deleted file mode 100644 index 3d6640a71..000000000 --- a/contribution/branches/PSO-DVRP/eoPsoDVRPEncodeSwarm.h +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright (C) DOLPHIN Project-Team, INRIA Lille Nord-Europe, 2007-2008 - * (C) OPAC Team, LIFL, 2002-2008 - * - * (c) Mostepha Redouane Khouadjia , 2008 - * - * This software is governed by the CeCILL license under French law and - * abiding by the rules of distribution of free software. You can use, - * modify and/ or redistribute the software under the terms of the CeCILL - * license as circulated by CEA, CNRS and INRIA at the following URL - * "http://www.cecill.info". - * - * As a counterpart to the access to the source code and rights to copy, - * modify and redistribute granted by the license, users are provided only - * with a limited warranty and the software's author, the holder of the - * economic rights, and the successive licensors have only limited liability. - * - * In this respect, the user's attention is drawn to the risks associated - * with loading, using, modifying and/or developing or reproducing the - * software by the user in light of its specific status of free software, - * that may mean that it is complicated to manipulate, and that also - * therefore means that it is reserved for developers and exper10ienced - * professionals having in-depth computer knowledge. Users are therefore - * encouraged to load and test the software's suitability as regards their - * requirements in conditions enabling the security of their systems and/or - * data to be ensured and, more generally, to use and operate it in the - * same conditions as regards security. - * The fact that you are presently reading this means that you have had - * knowledge of the CeCILL license and that you accept its terms. - * - * ParadisEO WebSite : http://paradiseo.gforge.inria.fr - * Contact: paradiseo-help@lists.gforge.inria.fr - * - */ -#ifndef EOPSODVRPENCODESWARM_H_ -#define EOPSODVRPENCODESWARM_H_ - -#include"eoPsoDVRPutils.h" - - - - -template < class POT > - -class eoPsoDVRPEncodeSwarm -{ - -public: - - eoPsoDVRPEncodeSwarm(){} - - - void operator()(eoPop & _pop, double _tstep, double _tslice) - - { - -/* - vector temp = newCustomers; - - - - if (_insertionMethode == "Hybrid") - { - - int i =0 ; - - int size = (int)(_pop.size()) / 3; - - - while(i < size) - { - - if (_rebuild =="Rebuild") - - _pop[i].cleanParticle(); - - _pop[i].encodingCurrentPositionRandomInsertion(_tstep, _tslice); - - if(_rebuild == "Rebuild") - - newCustomers = temp; - - i++ ; - - } - - - size = (int)(_pop.size()) * (3/4); - - - - while (i < size) - - { - - if (_rebuild =="Rebuild") - - _pop[i].cleanParticle(); - - _pop[i].encodingCurrentPositionNearestInsertion(_tstep, _tslice); - - if(_rebuild == "Rebuild") - - newCustomers = temp; - - i++ ; - - - } - - - size = (int)(_pop.size()); - - - while( i < size) - { - if (_rebuild =="Rebuild") - - _pop[i].cleanParticle(); - - _pop[i].encodingCurrentPositionCheapestInsertion(_tstep, _tslice); - - /*if(_rebuild == "Rebuild") - - newCustomers = temp; - - - i++; - - } - - } - - else - { -*/ - for (size_t i =0, size = _pop.size() ; i & _pop, double _tstep, double _tslice) - - { - - for (size_t i =0, size = _pop.size(); i & _pop){ - - for (size_t i =0, size = _pop.size() ; i