[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[oMetah-devel] ometah/communication itsCommunicationClient.hpp...
From: |
Johann |
Subject: |
[oMetah-devel] ometah/communication itsCommunicationClient.hpp... |
Date: |
Wed, 16 Mar 2005 14:03:32 -0500 |
CVSROOT: /cvsroot/ometah
Module name: ometah
Branch:
Changes by: Johann <address@hidden> 05/03/16 19:03:32
Modified files:
communication : itsCommunicationClient.hpp
itsCommunicationClient_embedded.cpp
itsCommunicationClient_embedded.hpp
itsCommunicationServer.hpp
itsCommunicationServer_embedded.cpp
itsCommunicationServer_embedded.hpp
Log message:
* method in mother class to preserve interface
* we must find a solution to handle multiple interface for the
communication classes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient_embedded.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationClient_embedded.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer_embedded.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/communication/itsCommunicationServer_embedded.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: ometah/communication/itsCommunicationClient.hpp
diff -u ometah/communication/itsCommunicationClient.hpp:1.4
ometah/communication/itsCommunicationClient.hpp:1.5
--- ometah/communication/itsCommunicationClient.hpp:1.4 Sat Mar 12 22:37:47 2005
+++ ometah/communication/itsCommunicationClient.hpp Wed Mar 16 19:03:31 2005
@@ -1,7 +1,7 @@
/***************************************************************************
* itsCommunicationClientt.hpp
*
- * $Id: itsCommunicationClient.hpp,v 1.4 2005/03/12 22:37:47 nojhan Exp $
+ * $Id: itsCommunicationClient.hpp,v 1.5 2005/03/16 19:03:31 nojhan Exp $
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -24,11 +24,31 @@
#ifndef ITSCOMMUNICATIONCLIENT
#define ITSCOMMUNICATIONCLIENT
-#include "../common/itsCommunication.hpp"
+#include "../communication/itsCommunication.hpp"
class itsCommunicationClient : public itsCommunication
{
+
+ //! Call the problem on a point to get its associated values
+ itsPoint call(itsPoint point);
+
+ //! The minima of the problem bounds
+ vector<double> boundsMinima();
+
+ //! The maxima of the problem bounds
+ vector<double> boundsMaxima();
+
+ //! The bounds matrix
+ /*!
+ This method call getBoundsMinima and getBoundsMaxima to produce
+ a matrix with each dimension on a row.
+ */
+ vector<vector<double> > bounds();
+
+ //! Return the dimension
+ int getDimension();
+
};
class itsCommunicationClientFactory
Index: ometah/communication/itsCommunicationClient_embedded.cpp
diff -u ometah/communication/itsCommunicationClient_embedded.cpp:1.1
ometah/communication/itsCommunicationClient_embedded.cpp:1.2
--- ometah/communication/itsCommunicationClient_embedded.cpp:1.1 Sat Mar
12 22:37:47 2005
+++ ometah/communication/itsCommunicationClient_embedded.cpp Wed Mar 16
19:03:31 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationClient_embedded.cpp,v 1.1 2005/03/12 22:37:47 nojhan
Exp $
+ * $Id: itsCommunicationClient_embedded.cpp,v 1.2 2005/03/16 19:03:31 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -20,6 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include "itsCommunicationServer_embedded.hpp"
+
itsCommunicationClientFactory_embedded::itsCommunicationClientFactory_embedded()
{
setKey("Embedded");
Index: ometah/communication/itsCommunicationClient_embedded.hpp
diff -u ometah/communication/itsCommunicationClient_embedded.hpp:1.1
ometah/communication/itsCommunicationClient_embedded.hpp:1.2
--- ometah/communication/itsCommunicationClient_embedded.hpp:1.1 Sat Mar
12 22:37:47 2005
+++ ometah/communication/itsCommunicationClient_embedded.hpp Wed Mar 16
19:03:31 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationClient_embedded.hpp,v 1.1 2005/03/12 22:37:47 nojhan
Exp $
+ * $Id: itsCommunicationClient_embedded.hpp,v 1.2 2005/03/16 19:03:31 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -34,33 +34,13 @@
public:
//! The problem directly embedded
itsCommunicationServer_embedded link;
-
-
- //! Call the problem on a point to get its associated values
- itsPoint call(itsPoint point);
-
- //! The minima of the problem bounds
- vector<double> boundsMinima();
-
- //! The maxima of the problem bounds
- vector<double> boundsMaxima();
-
- //! The bounds matrix
- /*!
- This method call getBoundsMinima and getBoundsMaxima to produce
- a matrix with each dimension on a row.
- */
- vector<vector<double> > bounds();
-
- //! Return the dimension
- int getDimension();
};
class itsCommunicationClientFactory_embedded : public
itsCommunicationClientFactory
{
public:
- itsCommunicationClient* create():
+ itsCommunicationClient* create();
};
#endif
Index: ometah/communication/itsCommunicationServer.hpp
diff -u ometah/communication/itsCommunicationServer.hpp:1.3
ometah/communication/itsCommunicationServer.hpp:1.4
--- ometah/communication/itsCommunicationServer.hpp:1.3 Sat Mar 12 22:37:47 2005
+++ ometah/communication/itsCommunicationServer.hpp Wed Mar 16 19:03:31 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationServer.hpp,v 1.3 2005/03/12 22:37:47 nojhan Exp $
+ * $Id: itsCommunicationServer.hpp,v 1.4 2005/03/16 19:03:31 nojhan Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -26,18 +26,17 @@
#include <vector>
#include "itsCommunication.hpp"
#include "../common/itsPoint.hpp"
-#include "itsProblem.hpp"
+#include "../problem/itsProblem.hpp"
using namespace std;
class itsCommunicationServer : public itsCommunication
{
-protected:
+public:
//! The problem
itsProblem* problem;
-public:
//! Call the problem on a point to get its associated values
itsPoint call(itsPoint point);
Index: ometah/communication/itsCommunicationServer_embedded.cpp
diff -u ometah/communication/itsCommunicationServer_embedded.cpp:1.1
ometah/communication/itsCommunicationServer_embedded.cpp:1.2
--- ometah/communication/itsCommunicationServer_embedded.cpp:1.1 Sat Mar
12 22:37:47 2005
+++ ometah/communication/itsCommunicationServer_embedded.cpp Wed Mar 16
19:03:31 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationServer_embedded.cpp,v 1.1 2005/03/12 22:37:47 nojhan
Exp $
+ * $Id: itsCommunicationServer_embedded.cpp,v 1.2 2005/03/16 19:03:31 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -20,6 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include "itsCommunicationServer_embedded.hpp"
+
itsCommunicationServer_embedded::itsCommunicationServer_embedded()
{
setKey("Embedded");
@@ -27,5 +29,5 @@
itsCommunicationServer* itsCommunicationServerFactory_embedded::create()
{
- return new itsCommunicationServerFactory_embedded;
+ return new itsCommunicationServer_embedded;
}
Index: ometah/communication/itsCommunicationServer_embedded.hpp
diff -u ometah/communication/itsCommunicationServer_embedded.hpp:1.1
ometah/communication/itsCommunicationServer_embedded.hpp:1.2
--- ometah/communication/itsCommunicationServer_embedded.hpp:1.1 Sat Mar
12 22:37:47 2005
+++ ometah/communication/itsCommunicationServer_embedded.hpp Wed Mar 16
19:03:31 2005
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: itsCommunicationServer_embedded.hpp,v 1.1 2005/03/12 22:37:47 nojhan
Exp $
+ * $Id: itsCommunicationServer_embedded.hpp,v 1.2 2005/03/16 19:03:31 nojhan
Exp $
* Copyright : Université Paris 12 Val-de-Marne
* Author : Johann Dréo <address@hidden>
****************************************************************************/
@@ -36,7 +36,7 @@
class itsCommunicationServerFactory_embedded : public
itsCommunicationServerFactory
{
public:
- itsCommunicationServer* create():
+ itsCommunicationServer* create();
};
#endif