Commit 56b9b4b9 authored by ics's avatar ics
Browse files
parents 1ad55ee0 38ae9513
......@@ -967,4 +967,4 @@
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cproject>
</cproject>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>NomadServer</name>
<name>nomad-server</name>
<comment></comment>
<projects>
</projects>
......
* Check the existence of application while logging, as it can die before the server connects to it.
* Added more log for disconnected clients.
* Added error "client disconnected" in command zone responder to avoid the return of disconnected clients.
* Added list for remaining command boxes in CommandBoxMap at server exit.
......
......@@ -32,7 +32,6 @@ AX_BOOST_UNIT_TEST_FRAMEWORK
AC_XERCES_C
AC_CMINPACK
AC_MUPARSER
AC_NEXUS
AC_LAPACK
AC_BLITZ
AC_PROTOBUF
......@@ -48,7 +47,6 @@ NOMAD_CXXFLAGS="$BOOST_CPPFLAGS \
$PTHREAD_CFLAGS \
$CMINPACK_CFLAGS \
$MUPARSER_CFLAGS \
$NEXUS_CFLAGS \
$BLITZ_CFLAGS \
$OPENSSL_INCLUDES \
$PROTOBUF_CFLAGS "$NOMAD_CXXFLAGS
......@@ -57,7 +55,6 @@ NOMAD_LDFLAGS="$BOOST_LDFLAGS \
$XERCES_LDFLAGS \
$CMINPACK_LDFLAGS \
$MUPARSER_LDFLAGS \
$NEXUS_LDFLAGS \
$LAPACK_LDFLAGS \
$OPENSSL_LDFLAGS \
$PROTOBUF_LDFLAGS \
......@@ -73,7 +70,6 @@ NOMAD_LIBS="$BOOST_DATE_TIME_LIB \
$PTHREAD_LIBS \
$CMINPACK_LIB \
$MUPARSER_LIB \
$NEXUS_LIB \
$LAPACK_LIB \
$OPENSSL_LIBS \
$PROTOBUF_LIB \
......
......@@ -590,10 +590,10 @@ nomad_LDFLAGS = \
$(NOMAD_LDFLAGS)
nomad_LDADD = \
libnomad.la \
ics/DeviceContainer/libicsdevicecontainer.la \
ics/InstrumentAbstraction/libicsinstrumentabstraction.la \
ics/CommandSystem/libicscommandsystem.la \
libnomad.la \
$(NOMAD_LIBS) -lSimpleAmqpClient -lssl
moduletest_SOURCES = \
......@@ -606,10 +606,10 @@ moduletest_LDFLAGS = \
$(NOMAD_LDFLAGS)
moduletest_LDADD = \
libnomad.la \
ics/DeviceContainer/libicsdevicecontainer.la \
ics/InstrumentAbstraction/libicsinstrumentabstraction.la \
ics/CommandSystem/libicscommandsystem.la \
libnomad.la \
$(NOMAD_LIBS) -lSimpleAmqpClient
dist_data_DATA = \
......@@ -643,10 +643,10 @@ moduleloadsequencer_LDFLAGS = \
$(NOMAD_LDFLAGS)
moduleloadsequencer_LDADD = \
libnomad.la \
ics/DeviceContainer/libicsdevicecontainer.la \
ics/InstrumentAbstraction/libicsinstrumentabstraction.la \
ics/CommandSystem/libicscommandsystem.la \
libnomad.la \
$(NOMAD_LIBS) -lSimpleAmqpClient
propertyaliascheck_SOURCES = \
......@@ -659,10 +659,10 @@ propertyaliascheck_LDFLAGS = \
$(NOMAD_LDFLAGS)
propertyaliascheck_LDADD = \
libnomad.la \
ics/DeviceContainer/libicsdevicecontainer.la \
ics/InstrumentAbstraction/libicsinstrumentabstraction.la \
ics/CommandSystem/libicscommandsystem.la \
libnomad.la \
$(NOMAD_LIBS) -lSimpleAmqpClient -lssl -lm
......
......@@ -24,7 +24,7 @@
#include "CenterOfMassPeakFinder.h"
BZ_USING_NAMESPACE(blitz)
using namespace blitz;
////////////////////////////////////////////////////////////////////////////
//// constructors
......
......@@ -26,7 +26,7 @@
#error <blitz/array/myMath.h> must be included after <blitz/array.h>
#endif
BZ_NAMESPACE(blitz)
namespace blitz {
/*! \file Determinant.h
\brief Compute determinants of matrices.
......@@ -38,7 +38,7 @@ template<typename T>
double determinant(const Array<T, 2>& B)
;
BZ_NAMESPACE_END
}
#include "Determinant.inl"
......
......@@ -22,7 +22,7 @@
#include <blitz/array.h>
BZ_NAMESPACE(blitz)
namespace blitz {
template<typename T>
double determinant(const Array<T, 2>& B)
......@@ -63,4 +63,4 @@ double determinant(const Array<T, 2>& B)
return 0;
}
BZ_NAMESPACE_END
\ No newline at end of file
}
\ No newline at end of file
......@@ -27,12 +27,12 @@
\brief a basic differentiator as the convolution of a bipolar squared function
*/
BZ_NAMESPACE(blitz)
namespace blitz {
template<typename T>
Array<T,1> differentiate(const Array<T,1>& data,unsigned int filterLength);
BZ_NAMESPACE_END
}
#include "Differentiate.inl"
......
......@@ -23,7 +23,7 @@
#include <blitz/array.h>
#include <blitz/array/convolve.h>
BZ_NAMESPACE(blitz)
namespace blitz {
template<typename T>
Array<T,1> differentiate(const Array<T,1>& data,unsigned int filterLength)
......@@ -44,4 +44,4 @@ std::cout<<"convolution size="<<result.size()<<" "<<data.size()<<" "<<kernel.siz
return result(Range(filterLength+1,n-filterLength));
}
BZ_NAMESPACE_END
\ No newline at end of file
}
\ No newline at end of file
......@@ -19,7 +19,7 @@
#include "ExponentialFit.h"
using namespace std;
BZ_USING_NAMESPACE(blitz)
using namespace blitz;
ExponentialFit::ExponentialFit (){
......
......@@ -25,7 +25,7 @@
#include <string.h>
using namespace std;
BZ_USING_NAMESPACE(blitz)
using namespace blitz;
blitz::Array<double, 1> readDataFile(const std::string& fileName)
{
......
......@@ -30,7 +30,7 @@
#include "DataReadWrite.h"
using namespace std;
BZ_USING_NAMESPACE(blitz)
using namespace blitz;
BZ_USING_NAMESPACE(ranlib)
int main(int argc, char *argv[]) {
......
......@@ -30,7 +30,7 @@
#include "DataReadWrite.h"
using namespace std;
BZ_USING_NAMESPACE(blitz)
using namespace blitz;
BZ_USING_NAMESPACE(ranlib)
struct PeakInfo
......
......@@ -29,7 +29,7 @@
#include "common/analysislibrary/Tools.h"
using namespace std;
BZ_USING_NAMESPACE(blitz)
using namespace blitz;
namespace fs = boost::filesystem;
......
......@@ -22,7 +22,7 @@
#include <vector>
using namespace std;
BZ_USING_NAMESPACE(blitz)
using namespace blitz;
const double GaussFit::INCLUDED_VALUES_RATIO = 0.5;
const double GaussFit::DELTA_POSITION_MAX = 0.1;
......
......@@ -23,7 +23,7 @@
#error <blitz/array/myMath.h> must be included after <blitz/array.h>
#endif
BZ_NAMESPACE(blitz)
namespace blitz {
/*! \file inverseGJ.h
\brief Compute the inverse of matrices up to 6x6
......@@ -39,7 +39,7 @@ BZ_NAMESPACE(blitz)
template<typename T>
Array<T, 2> inverseGJ(const Array<T, 2>& B);
BZ_NAMESPACE_END
}
#include "GaussJordan.inl"
......
......@@ -26,7 +26,7 @@
#include <blitz/array.h>
#include<math.h>
BZ_NAMESPACE(blitz)
namespace blitz {
template<typename T>
Array<T,2> inverseGJ(const Array<T,2>& B)
......@@ -126,4 +126,4 @@ Array<T,2> inverseGJ(const Array<T,2>& B)
return a;
}
BZ_NAMESPACE_END
\ No newline at end of file
}
\ No newline at end of file
......@@ -29,7 +29,7 @@
\brief Makes the histogram of 1D and 2D data
*/
BZ_NAMESPACE(blitz)
namespace blitz {
class Histogram
{
......@@ -50,7 +50,7 @@ template<typename T>
Histogram histogram(const Array<T, 1>& data,int nbBins)
;
BZ_NAMESPACE_END
}
#include "Histogram.inl"
......
......@@ -22,7 +22,7 @@
#include <blitz/array.h>
BZ_NAMESPACE(blitz)
namespace blitz {
////////////////////////////////////////////////////////////
/// Main histogramming routine
......@@ -100,4 +100,4 @@ Histogram histogram(const Array<T, 1>& data, int nbBins)
return histogram(data, minValue, maxValue, nbBins);
}
BZ_NAMESPACE_END
\ No newline at end of file
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment