Attention une mise à jour du serveur va être effectuée le vendredi 16 avril entre 12h et 12h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit a4de830e authored by PACANOWSKI Romain's avatar PACANOWSKI Romain

Merge

parents 6f692933 00513083
......@@ -26,7 +26,9 @@ PLUGIN_LIB = ['core', 'stdc++']
## Python and boost-python library
##
## Be sure to install boost-python and python
## You can do this by using Macports (http://www.macports.org/)
## or Homebrew (http://brew.sh/)
PYTHON_INC = ['/opt/local/include', '/usr/include/python2.7']
PYTHON_DIR = ['/opt/local/lib']
PYTHON_LIB = ['boost_python-mt', 'python2.7']
......
......@@ -22,7 +22,9 @@ PLUGIN_LIB = ['core']
## Python and boost-python library
##
## Be sure to install boost-python and python
## You can do this by using Macports (http://www.macports.org/)
## or Homebrew (http://brew.sh/)
PYTHON_INC = ['/opt/local/include', '/usr/include/python2.7']
PYTHON_DIR = ['/opt/local/lib']
PYTHON_LIB = ['boost_python-mt', 'python2.7']
......
TARGET = quadprog++
TEMPLATE = lib
CONFIG *= static \
qt \
plugin \
eigen
......
TARGET = quadprog++
TEMPLATE = lib
CONFIG *= static \
qt \
plugin \
eigen
......
......@@ -14,10 +14,13 @@ if [ "$BASH_VERSION" ]; then
elif [ "$ZSH_VERSION" ]; then
sources=$(dirname "$0:A")
fi
path=${sources}/sources/build
path=${sources}/sources/build/
scripts=${sources}/sources/scripts/
export ALTA=$sources
export ALTA_DIR=$sources/sources
export ALTA_LIB=$path
export ALTA_DIR=${sources}/sources/
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$path
export PATH=$PATH:$path
export PATH=$PATH:$path:$scripts
export PYTHONPATH=$PYTHONPATH:$path
......@@ -19,7 +19,8 @@ if conf.CheckLibWithHeader(env['CERES_LIB'], 'ceres/ceres.h', 'c++'):
#end
build_lib = True
else:
print "<<ERROR>> Unable to find Ceres Headers or libraries. Check your CERES Install"
#end
env = conf.Finish()
......
......@@ -13,11 +13,12 @@ conf = Configure(env)
if conf.CheckLib(env['MATLAB_LIB']):
build_lib = True
else:
print "<<ERROR>> Unable to find Matlab for Rational Fitter. Check your MATLAB install"
#end
conf.Finish()
if build_lib:
sources = ['rational_fitter.cpp']
env.SharedLibrary('../../build/rational_fitter_matlab', sources)
#end
\ No newline at end of file
#end
......@@ -7,14 +7,11 @@ cd ../alta-alpha
# Remove unecessary parts (data, retro plugins, ...)
rm -rf data
rm -rf papers
rm -rf external/quadprog++-v2
rm -rf sources/tests
rm -rf sources/matlab
rm -rf sources/xml
rm -rf sources/scripts/unitary*
rm -rf sources/plugins/*retro*
rm -rf sources/plugins/shifted_gamma_function
rm -rf sources/plugins/rational_fitter_parsec_*
rm -rf sources/softs/tests
rm -rf sources/softs/rational_1d
rm -rf sources/softs/generate_data
......@@ -23,7 +20,7 @@ rm -rf sources/softs/data2diff
rm -rf sources/scripts/generate-alpha.sh
# Creating the C++ LICENSE header
echo "/*\n$(cat LICENSE.txt | while read LINE; do echo " * $LINE"; done;)\n */\n\n" > LICENSE.C
echo "/*$(cat LICENSE.txt | while read LINE; do echo " * $LINE"; done;) */" > LICENSE.C
# Add headers to all .cpp .h files
find ./sources/ -regex ".*\.\(h\|cpp\)$" | while read FILE; do
......
......@@ -15,14 +15,7 @@
int main(int argc, char** argv)
{
<<<<<<< local
QApplication app(argc, argv, false);
arguments args(argc, argv);
plugins_manager manager(args) ;
=======
arguments args(argc, argv) ;
>>>>>>> other
if(args.is_defined("help")) {
std::cout << "<<HELP>> data2diff --input data.file --output gnuplot.file --data loader.so --param RUSIN_TH_PH_TD_PD --partial 0" << std::endl ;
......
Markdown is supported
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