Modified the eoCtrlCContinue - had to create the eoCtrlCContinue.cpp
to make t-eoGA work (you should NOT have separate functions in .h files!) I also included everything related to Ctrl C handling in #ifndef _MSC_VER until someone tells me how to do it in MSVC
This commit is contained in:
parent
bfca8ca433
commit
3d757e3243
4 changed files with 72 additions and 31 deletions
|
|
@ -8,7 +8,7 @@ SUBDIRS = es ga gp utils other
|
||||||
CPPFLAGS = -O2
|
CPPFLAGS = -O2
|
||||||
|
|
||||||
lib_LIBRARIES = libeo.a
|
lib_LIBRARIES = libeo.a
|
||||||
libeo_a_SOURCES = eoFunctorStore.cpp eoPersistent.cpp eoPrintable.cpp
|
libeo_a_SOURCES = eoFunctorStore.cpp eoPersistent.cpp eoPrintable.cpp eoCtrlCContinue.cpp
|
||||||
|
|
||||||
libeoincdir = $(includedir)/eo
|
libeoincdir = $(includedir)/eo
|
||||||
libeoinc_HEADERS = *.h eo
|
libeoinc_HEADERS = *.h eo
|
||||||
|
|
|
||||||
45
eo/src/eoCtrlCContinue.cpp
Normal file
45
eo/src/eoCtrlCContinue.cpp
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// eoCtrlCContinue.cpp
|
||||||
|
// (c) EEAAX 1996 - GeNeura Team, 1998 - Maarten Keijzer 2000
|
||||||
|
/*
|
||||||
|
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; either
|
||||||
|
version 2 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
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: todos@geneura.ugr.es, http://geneura.ugr.es
|
||||||
|
Marc.Schoenauer@polytechnique.fr
|
||||||
|
mak@dhi.dk
|
||||||
|
*/
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
#include <signal.h>
|
||||||
|
#include <stream.h>
|
||||||
|
|
||||||
|
// --- Global variables - but don't know what else to do - MS ---
|
||||||
|
static bool arret_demande = false;
|
||||||
|
static bool existCtrlCContinue = false;
|
||||||
|
|
||||||
|
//
|
||||||
|
// The signal handler - installed in the eoCtrlCContinue Ctor
|
||||||
|
//
|
||||||
|
void signal_handler( int sig )
|
||||||
|
// ---------------------------
|
||||||
|
{
|
||||||
|
// --- On veut la paix, jusqu'a la fin ---
|
||||||
|
signal( SIGINT, SIG_IGN );
|
||||||
|
signal( SIGQUIT, SIG_IGN );
|
||||||
|
cerr << "Ctrl C entered ... closing down" << endl ;
|
||||||
|
arret_demande = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -23,39 +23,18 @@
|
||||||
mak@dhi.dk
|
mak@dhi.dk
|
||||||
*/
|
*/
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
// the same thing can probably be done in MS environement, but I hoave no way
|
||||||
|
// to test it so at the moment it is commented out when in MSVC
|
||||||
|
#ifndef _MSC_VER
|
||||||
|
|
||||||
#ifndef eoCtrlCContinue_h
|
#ifndef eoCtrlCContinue_h
|
||||||
#define eoCtrlCContinue_h
|
#define eoCtrlCContinue_h
|
||||||
|
|
||||||
#include <signal.h>
|
|
||||||
#include <eoContinue.h>
|
#include <eoContinue.h>
|
||||||
|
|
||||||
// --- Global variables - but don't know what else to do - MS ---
|
extern bool arret_demande, existCtrlCContinue;
|
||||||
static bool arret_demande = false;
|
|
||||||
static bool existCtrlCContinue = false;
|
|
||||||
|
|
||||||
//
|
|
||||||
// The signal handler - installed in the eoCtrlCContinue Ctor
|
|
||||||
//
|
|
||||||
void signal_handler( int sig )
|
|
||||||
// ---------------------------
|
|
||||||
{
|
|
||||||
// --- On veut la paix, jusqu'a la fin ---
|
|
||||||
signal( SIGINT, SIG_IGN );
|
|
||||||
signal( SIGQUIT, SIG_IGN );
|
|
||||||
cerr << "Ctrl C entered ... closing down" << endl ;
|
|
||||||
arret_demande = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// Permet de savoir si on a appuye sur Control-C
|
|
||||||
// (renvoie alors 1)
|
|
||||||
//
|
|
||||||
int AppliArretDemande()
|
|
||||||
// --------------------
|
|
||||||
{
|
|
||||||
return arret_demande;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
extern void signal_handler( int sig );
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -85,8 +64,9 @@ public:
|
||||||
return false;
|
return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // of MSVC comment-out
|
||||||
|
|
|
||||||
|
|
@ -234,6 +234,22 @@ class eoPop: public vector<EOT>, public eoObject, public eoPersistent
|
||||||
std::swap(static_cast<vector<EOT>& >(*this), static_cast<vector<EOT>& >(other));
|
std::swap(static_cast<vector<EOT>& >(*this), static_cast<vector<EOT>& >(other));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prints sorted pop but does NOT modify it!
|
||||||
|
*
|
||||||
|
* @param _os A ostream.
|
||||||
|
*/
|
||||||
|
virtual void sortedPrintOn(ostream& _os) const
|
||||||
|
{
|
||||||
|
vector<const EOT*> result;
|
||||||
|
sort(result);
|
||||||
|
_os << size() << '\n';
|
||||||
|
for (unsigned i = 0; i < size(); ++i)
|
||||||
|
{
|
||||||
|
_os << *result[i] << endl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Write object. It's called printOn since it prints the object _on_ a stream.
|
* Write object. It's called printOn since it prints the object _on_ a stream.
|
||||||
* @param _os A ostream.
|
* @param _os A ostream.
|
||||||
|
|
@ -242,7 +258,7 @@ class eoPop: public vector<EOT>, public eoObject, public eoPersistent
|
||||||
{
|
{
|
||||||
_os << size() << '\n';
|
_os << size() << '\n';
|
||||||
copy( begin(), end(), ostream_iterator<EOT>( _os, "\n") );
|
copy( begin(), end(), ostream_iterator<EOT>( _os, "\n") );
|
||||||
};
|
}
|
||||||
|
|
||||||
/** @name Methods from eoObject */
|
/** @name Methods from eoObject */
|
||||||
//@{
|
//@{
|
||||||
|
|
|
||||||
Reference in a new issue