mirror of
https://github.com/aportelli/LatAnalyze.git
synced 2024-11-10 00:45:36 +00:00
reorganizing sources...
This commit is contained in:
parent
0109379dc3
commit
5b65dc8fc9
10
.gitignore
vendored
10
.gitignore
vendored
@ -19,10 +19,10 @@ configure
|
||||
aclocal.m4
|
||||
|
||||
# bison/flex generated sources
|
||||
latan/*Lexer.cpp
|
||||
latan/*Parser.cpp
|
||||
latan/*Parser.hpp
|
||||
lib/*Lexer.cpp
|
||||
lib/*Parser.cpp
|
||||
lib/*Parser.hpp
|
||||
|
||||
# Eigen headers
|
||||
latan/Eigen/*
|
||||
latan/eigen_files.mk
|
||||
lib/Eigen/*
|
||||
lib/eigen_files.mk
|
||||
|
@ -1,3 +1,3 @@
|
||||
SUBDIRS = latan utils examples
|
||||
SUBDIRS = lib utils examples
|
||||
|
||||
ACLOCAL_AMFLAGS = -I .buildutils/m4
|
||||
|
@ -2,9 +2,9 @@
|
||||
|
||||
# Initialization
|
||||
AC_PREREQ([2.64])
|
||||
AC_INIT([LatAnalyze],[3.0alpha1],[antonin.portelli@me.com],[latan])
|
||||
AC_INIT([LatAnalyze],[3.0alpha1],[antonin.portelli@me.com],[LatAnalyze])
|
||||
AC_CONFIG_AUX_DIR([.buildutils])
|
||||
AC_CONFIG_SRCDIR([latan/Global.cpp])
|
||||
AC_CONFIG_SRCDIR([lib/Global.cpp])
|
||||
AC_CONFIG_SRCDIR([utils/sample_read.cpp])
|
||||
AC_CONFIG_SRCDIR([examples/exMathInterpreter.cpp])
|
||||
AC_CONFIG_MACRO_DIR([.buildutils/m4])
|
||||
@ -94,5 +94,5 @@ AC_SUBST([LIBS])
|
||||
AC_SUBST([AM_CFLAGS])
|
||||
AC_SUBST([AM_LDFLAGS])
|
||||
|
||||
AC_CONFIG_FILES([Makefile latan/Makefile utils/Makefile examples/Makefile])
|
||||
AC_CONFIG_FILES([Makefile lib/Makefile utils/Makefile examples/Makefile])
|
||||
AC_OUTPUT
|
||||
|
1
examples/LatAnalyze
Symbolic link
1
examples/LatAnalyze
Symbolic link
@ -0,0 +1 @@
|
||||
../lib
|
@ -1,6 +1,6 @@
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
#include <latan/CompiledFunction.hpp>
|
||||
#include <LatAnalyze/CompiledFunction.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
||||
|
@ -1,10 +1,10 @@
|
||||
#include <iostream>
|
||||
#include <cmath>
|
||||
#include <latan/CompiledModel.hpp>
|
||||
#include <latan/MinuitMinimizer.hpp>
|
||||
#include <latan/Plot.hpp>
|
||||
#include <latan/RandGen.hpp>
|
||||
#include <latan/XYStatData.hpp>
|
||||
#include <LatAnalyze/CompiledModel.hpp>
|
||||
#include <LatAnalyze/MinuitMinimizer.hpp>
|
||||
#include <LatAnalyze/Plot.hpp>
|
||||
#include <LatAnalyze/RandGen.hpp>
|
||||
#include <LatAnalyze/XYStatData.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <iostream>
|
||||
#include <latan/AsciiFile.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <latan/Math.hpp>
|
||||
#include <LatAnalyze/AsciiFile.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <LatAnalyze/Math.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include <iostream>
|
||||
#include <latan/Math.hpp>
|
||||
#include <latan/MathInterpreter.hpp>
|
||||
#include <LatAnalyze/Math.hpp>
|
||||
#include <LatAnalyze/MathInterpreter.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include <iostream>
|
||||
#include <latan/CompiledFunction.hpp>
|
||||
#include <latan/MinuitMinimizer.hpp>
|
||||
#include <LatAnalyze/CompiledFunction.hpp>
|
||||
#include <LatAnalyze/MinuitMinimizer.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <iostream>
|
||||
#include <latan/CompiledFunction.hpp>
|
||||
#include <latan/Math.hpp>
|
||||
#include <latan/Plot.hpp>
|
||||
#include <LatAnalyze/CompiledFunction.hpp>
|
||||
#include <LatAnalyze/Math.hpp>
|
||||
#include <LatAnalyze/Plot.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include <iostream>
|
||||
#include <latan/AsciiFile.hpp>
|
||||
#include <latan/RandGen.hpp>
|
||||
#include <LatAnalyze/AsciiFile.hpp>
|
||||
#include <LatAnalyze/RandGen.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
||||
|
@ -1 +0,0 @@
|
||||
../latan
|
@ -1,85 +0,0 @@
|
||||
if CC_GNU
|
||||
COM_CFLAGS = -Wall -W -pedantic
|
||||
else
|
||||
if CC_INTEL
|
||||
COM_CFLAGS = -Wall
|
||||
endif
|
||||
endif
|
||||
|
||||
if CXX_GNU
|
||||
COM_CXXFLAGS = -Wall -W -pedantic
|
||||
else
|
||||
if CXX_INTEL
|
||||
COM_CXXFLAGS = -Wall
|
||||
endif
|
||||
endif
|
||||
|
||||
AM_LFLAGS = -olex.yy.c
|
||||
AM_YFLAGS = -d
|
||||
|
||||
include eigen_files.mk
|
||||
nobase_dist_pkginclude_HEADERS = $(eigen_files)
|
||||
|
||||
BUILT_SOURCES = AsciiParser.hpp MathParser.hpp
|
||||
|
||||
lib_LTLIBRARIES = liblatan.la
|
||||
|
||||
liblatan_la_SOURCES = \
|
||||
AsciiFile.cpp \
|
||||
AsciiParser.ypp \
|
||||
AsciiLexer.lpp \
|
||||
Chi2Function.cpp \
|
||||
CompiledFunction.cpp\
|
||||
CompiledModel.cpp \
|
||||
Exceptions.cpp \
|
||||
Function.cpp \
|
||||
Global.cpp \
|
||||
includes.hpp \
|
||||
File.cpp \
|
||||
FitInterface.cpp \
|
||||
Mat.cpp \
|
||||
Math.cpp \
|
||||
MathInterpreter.cpp \
|
||||
MathParser.ypp \
|
||||
MathLexer.lpp \
|
||||
MatSample.cpp \
|
||||
Minimizer.cpp \
|
||||
Model.cpp \
|
||||
Plot.cpp \
|
||||
RandGen.cpp \
|
||||
XYSampleData.cpp \
|
||||
XYStatData.cpp \
|
||||
../config.h
|
||||
liblatan_ladir = $(pkgincludedir)
|
||||
liblatan_la_HEADERS = \
|
||||
AsciiFile.hpp \
|
||||
Chi2Function.hpp \
|
||||
CompiledFunction.hpp\
|
||||
CompiledModel.hpp \
|
||||
Dataset.hpp \
|
||||
FitInterface.hpp \
|
||||
Function.hpp \
|
||||
Global.hpp \
|
||||
File.hpp \
|
||||
IoObject.hpp \
|
||||
Mat.hpp \
|
||||
Math.hpp \
|
||||
MathInterpreter.hpp \
|
||||
MatSample.hpp \
|
||||
Minimizer.hpp \
|
||||
Model.hpp \
|
||||
ParserState.hpp \
|
||||
Plot.hpp \
|
||||
RandGen.hpp \
|
||||
StatArray.hpp \
|
||||
XYSampleData.hpp \
|
||||
XYStatData.hpp
|
||||
if HAVE_MINUIT
|
||||
liblatan_la_SOURCES += MinuitMinimizer.cpp
|
||||
liblatan_la_HEADERS += MinuitMinimizer.hpp
|
||||
endif
|
||||
|
||||
liblatan_la_CFLAGS = $(COM_CFLAGS)
|
||||
liblatan_la_CXXFLAGS = $(COM_CXXFLAGS)
|
||||
|
||||
ACLOCAL_AMFLAGS = -I .buildutils/m4
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/AsciiFile.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/AsciiFile.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,11 +20,11 @@
|
||||
#ifndef Latan_AsciiFile_hpp_
|
||||
#define Latan_AsciiFile_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/File.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <latan/MatSample.hpp>
|
||||
#include <latan/RandGen.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/File.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <LatAnalyze/MatSample.hpp>
|
||||
#include <LatAnalyze/RandGen.hpp>
|
||||
#include <fstream>
|
||||
|
||||
BEGIN_NAMESPACE
|
@ -26,8 +26,8 @@
|
||||
|
||||
%{
|
||||
#include <iostream>
|
||||
#include <latan/AsciiFile.hpp>
|
||||
#include <latan/AsciiParser.hpp>
|
||||
#include <LatAnalyze/AsciiFile.hpp>
|
||||
#include <LatAnalyze/AsciiParser.hpp>
|
||||
#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
@ -18,11 +18,11 @@
|
||||
*/
|
||||
|
||||
%{
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/AsciiFile.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <latan/MatSample.hpp>
|
||||
#include <latan/RandGen.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/AsciiFile.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <LatAnalyze/MatSample.hpp>
|
||||
#include <LatAnalyze/RandGen.hpp>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <utility>
|
@ -17,9 +17,9 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/Chi2Function.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <latan/XYStatData.hpp>
|
||||
#include <LatAnalyze/Chi2Function.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
#include <LatAnalyze/XYStatData.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_Chi2Function_hpp_
|
||||
#define Latan_Chi2Function_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/Model.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/Model.hpp>
|
||||
|
||||
BEGIN_NAMESPACE
|
||||
|
@ -17,9 +17,9 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/CompiledFunction.hpp>
|
||||
#include <latan/Math.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/CompiledFunction.hpp>
|
||||
#include <LatAnalyze/Math.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_CompiledFunction_hpp_
|
||||
#define Latan_CompiledFunction_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/MathInterpreter.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/MathInterpreter.hpp>
|
||||
|
||||
BEGIN_NAMESPACE
|
||||
|
@ -17,9 +17,9 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/CompiledModel.hpp>
|
||||
#include <latan/Math.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/CompiledModel.hpp>
|
||||
#include <LatAnalyze/Math.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_CompiledModel_hpp_
|
||||
#define Latan_CompiledModel_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Model.hpp>
|
||||
#include <latan/MathInterpreter.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Model.hpp>
|
||||
#include <LatAnalyze/MathInterpreter.hpp>
|
||||
|
||||
BEGIN_NAMESPACE
|
||||
|
@ -20,10 +20,10 @@
|
||||
#ifndef Latan_Dataset_hpp_
|
||||
#define Latan_Dataset_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/File.hpp>
|
||||
#include <latan/StatArray.hpp>
|
||||
#include <latan/RandGen.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/File.hpp>
|
||||
#include <LatAnalyze/StatArray.hpp>
|
||||
#include <LatAnalyze/RandGen.hpp>
|
||||
#include <fstream>
|
||||
#include <vector>
|
||||
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/Exceptions.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/Exceptions.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
#ifndef ERR_SUFF
|
||||
#define ERR_SUFF " (" + loc + ")"
|
@ -22,7 +22,7 @@
|
||||
|
||||
#include <stdexcept>
|
||||
#ifndef LATAN_GLOBAL_HPP_
|
||||
#include <latan/Global.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#endif
|
||||
|
||||
#define SRC_LOC strFrom(__FUNCTION__) + " at " + strFrom(__FILE__) + ":"\
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/File.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/File.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_Io_hpp_
|
||||
#define Latan_Io_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/IoObject.hpp>
|
||||
#include <latan/ParserState.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/IoObject.hpp>
|
||||
#include <LatAnalyze/ParserState.hpp>
|
||||
#include <queue>
|
||||
#include <unordered_map>
|
||||
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/FitInterface.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/FitInterface.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,8 +20,8 @@
|
||||
#ifndef Latan_FitInterface_hpp_
|
||||
#define Latan_FitInterface_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Minimizer.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Minimizer.hpp>
|
||||
|
||||
BEGIN_NAMESPACE
|
||||
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_Function_hpp_
|
||||
#define Latan_Function_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <latan/MatSample.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <LatAnalyze/MatSample.hpp>
|
||||
#include <functional>
|
||||
#include <stack>
|
||||
#include <vector>
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -23,7 +23,7 @@
|
||||
// supress warning for the osbolete use of 'register' keyword in Eigen
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-register"
|
||||
|
||||
#include <latan/Eigen/Dense>
|
||||
#include <LatAnalyze/Eigen/Dense>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
@ -184,6 +184,6 @@ inline std::string strFrom(const T x)
|
||||
|
||||
END_NAMESPACE
|
||||
|
||||
#include <latan/Exceptions.hpp>
|
||||
#include <LatAnalyze/Exceptions.hpp>
|
||||
|
||||
#endif // Latan_Global_hpp_
|
@ -20,7 +20,7 @@
|
||||
#ifndef Latan_IoObject_hpp_
|
||||
#define Latan_IoObject_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
|
||||
BEGIN_NAMESPACE
|
||||
|
85
lib/Makefile.am
Normal file
85
lib/Makefile.am
Normal file
@ -0,0 +1,85 @@
|
||||
if CC_GNU
|
||||
COM_CFLAGS = -Wall -W -pedantic
|
||||
else
|
||||
if CC_INTEL
|
||||
COM_CFLAGS = -Wall
|
||||
endif
|
||||
endif
|
||||
|
||||
if CXX_GNU
|
||||
COM_CXXFLAGS = -Wall -W -pedantic
|
||||
else
|
||||
if CXX_INTEL
|
||||
COM_CXXFLAGS = -Wall
|
||||
endif
|
||||
endif
|
||||
|
||||
AM_LFLAGS = -olex.yy.c
|
||||
AM_YFLAGS = -d
|
||||
|
||||
include eigen_files.mk
|
||||
nobase_dist_pkginclude_HEADERS = $(eigen_files)
|
||||
|
||||
BUILT_SOURCES = AsciiParser.hpp MathParser.hpp
|
||||
|
||||
lib_LTLIBRARIES = libLatAnalyze.la
|
||||
|
||||
libLatAnalyze_la_SOURCES =\
|
||||
AsciiFile.cpp \
|
||||
AsciiParser.ypp \
|
||||
AsciiLexer.lpp \
|
||||
Chi2Function.cpp \
|
||||
CompiledFunction.cpp \
|
||||
CompiledModel.cpp \
|
||||
Exceptions.cpp \
|
||||
Function.cpp \
|
||||
Global.cpp \
|
||||
includes.hpp \
|
||||
File.cpp \
|
||||
FitInterface.cpp \
|
||||
Mat.cpp \
|
||||
Math.cpp \
|
||||
MathInterpreter.cpp \
|
||||
MathParser.ypp \
|
||||
MathLexer.lpp \
|
||||
MatSample.cpp \
|
||||
Minimizer.cpp \
|
||||
Model.cpp \
|
||||
Plot.cpp \
|
||||
RandGen.cpp \
|
||||
XYSampleData.cpp \
|
||||
XYStatData.cpp \
|
||||
../config.h
|
||||
libLatAnalyze_ladir = $(pkgincludedir)
|
||||
libLatAnalyze_la_HEADERS =\
|
||||
AsciiFile.hpp \
|
||||
Chi2Function.hpp \
|
||||
CompiledFunction.hpp \
|
||||
CompiledModel.hpp \
|
||||
Dataset.hpp \
|
||||
FitInterface.hpp \
|
||||
Function.hpp \
|
||||
Global.hpp \
|
||||
File.hpp \
|
||||
IoObject.hpp \
|
||||
Mat.hpp \
|
||||
Math.hpp \
|
||||
MathInterpreter.hpp \
|
||||
MatSample.hpp \
|
||||
Minimizer.hpp \
|
||||
Model.hpp \
|
||||
ParserState.hpp \
|
||||
Plot.hpp \
|
||||
RandGen.hpp \
|
||||
StatArray.hpp \
|
||||
XYSampleData.hpp \
|
||||
XYStatData.hpp
|
||||
if HAVE_MINUIT
|
||||
libLatAnalyze_la_SOURCES += MinuitMinimizer.cpp
|
||||
libLatAnalyze_la_HEADERS += MinuitMinimizer.hpp
|
||||
endif
|
||||
|
||||
libLatAnalyze_la_CFLAGS = $(COM_CFLAGS)
|
||||
libLatAnalyze_la_CXXFLAGS = $(COM_CXXFLAGS)
|
||||
|
||||
ACLOCAL_AMFLAGS = -I .buildutils/m4
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/Mat.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,8 +20,8 @@
|
||||
#ifndef Latan_Mat_hpp_
|
||||
#define Latan_Mat_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/IOObject.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/IOObject.hpp>
|
||||
|
||||
#define FOR_MAT(mat, i, j) \
|
||||
for (Latan::Index j = 0; j < mat.cols(); ++j)\
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/MatSample.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/MatSample.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_MatSample_hpp_
|
||||
#define Latan_MatSample_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <latan/StatArray.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <LatAnalyze/StatArray.hpp>
|
||||
|
||||
BEGIN_NAMESPACE
|
||||
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/Math.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/Math.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_Math_hpp_
|
||||
#define Latan_Math_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/MathInterpreter.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/MathInterpreter.hpp>
|
||||
|
||||
BEGIN_NAMESPACE
|
||||
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/MathInterpreter.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/MathInterpreter.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -25,9 +25,9 @@
|
||||
#include <queue>
|
||||
#include <string>
|
||||
#include <stack>
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/ParserState.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/ParserState.hpp>
|
||||
|
||||
#define MAXIDLENGTH 256
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
%{
|
||||
#include <iostream>
|
||||
#include <latan/MathInterpreter.hpp>
|
||||
#include <latan/MathParser.hpp>
|
||||
#include <LatAnalyze/MathInterpreter.hpp>
|
||||
#include <LatAnalyze/MathParser.hpp>
|
||||
#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
@ -21,8 +21,8 @@
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <cstring>
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/MathInterpreter.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/MathInterpreter.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/Minimizer.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/Minimizer.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_Minimizer_hpp_
|
||||
#define Latan_Minimizer_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
|
||||
BEGIN_NAMESPACE
|
||||
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/MinuitMinimizer.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/MinuitMinimizer.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
#include <Minuit2/FCNBase.h>
|
||||
#include <Minuit2/FunctionMinimum.h>
|
||||
#include <Minuit2/MnMigrad.h>
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_MinuitMinimizer_hpp_
|
||||
#define Latan_MinuitMinimizer_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/Minimizer.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/Minimizer.hpp>
|
||||
#include <Minuit2/FCNBase.h>
|
||||
|
||||
BEGIN_NAMESPACE
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/Model.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/Model.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
#include <functional>
|
||||
|
||||
using namespace std;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_Model_hpp_
|
||||
#define Latan_Model_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <vector>
|
||||
|
||||
BEGIN_NAMESPACE
|
@ -20,7 +20,7 @@
|
||||
#ifndef Latan_ParserState_hpp_
|
||||
#define Latan_ParserState_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <iostream>
|
||||
|
||||
BEGIN_NAMESPACE
|
@ -17,9 +17,9 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/Plot.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <LatAnalyze/Plot.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,9 +20,9 @@
|
||||
#ifndef Latan_Plot_hpp_
|
||||
#define Latan_Plot_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <latan/XYStatData.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <LatAnalyze/XYStatData.hpp>
|
||||
#include <sstream>
|
||||
#include <stack>
|
||||
#include <vector>
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/RandGen.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/RandGen.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
#ifndef RLXD_LEVEL
|
||||
#define RLXD_LEVEL 1
|
@ -20,8 +20,8 @@
|
||||
#ifndef Latan_RandGen_hpp_
|
||||
#define Latan_RandGen_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/IoObject.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/IoObject.hpp>
|
||||
|
||||
#define RLXG_STATE_SIZE 105u
|
||||
|
@ -20,8 +20,8 @@
|
||||
#ifndef Latan_StatArray_hpp_
|
||||
#define Latan_StatArray_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <iostream>
|
||||
|
||||
#define FOR_STAT_ARRAY(ar, i) \
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/XYSampleData.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/XYSampleData.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,12 +20,12 @@
|
||||
#ifndef Latan_XYSampleData_hpp_
|
||||
#define Latan_XYSampleData_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/FitInterface.hpp>
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/MatSample.hpp>
|
||||
#include <latan/Minimizer.hpp>
|
||||
#include <latan/XYStatData.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/FitInterface.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/MatSample.hpp>
|
||||
#include <LatAnalyze/Minimizer.hpp>
|
||||
#include <LatAnalyze/XYStatData.hpp>
|
||||
|
||||
BEGIN_NAMESPACE
|
||||
|
@ -17,8 +17,8 @@
|
||||
* along with LatAnalyze 3. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <latan/XYStatData.hpp>
|
||||
#include <latan/includes.hpp>
|
||||
#include <LatAnalyze/XYStatData.hpp>
|
||||
#include <LatAnalyze/includes.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
@ -20,13 +20,13 @@
|
||||
#ifndef Latan_XYData_hpp_
|
||||
#define Latan_XYData_hpp_
|
||||
|
||||
#include <latan/Global.hpp>
|
||||
#include <latan/Chi2Function.hpp>
|
||||
#include <latan/FitInterface.hpp>
|
||||
#include <latan/Function.hpp>
|
||||
#include <latan/Mat.hpp>
|
||||
#include <latan/Minimizer.hpp>
|
||||
#include <latan/Model.hpp>
|
||||
#include <LatAnalyze/Global.hpp>
|
||||
#include <LatAnalyze/Chi2Function.hpp>
|
||||
#include <LatAnalyze/FitInterface.hpp>
|
||||
#include <LatAnalyze/Function.hpp>
|
||||
#include <LatAnalyze/Mat.hpp>
|
||||
#include <LatAnalyze/Minimizer.hpp>
|
||||
#include <LatAnalyze/Model.hpp>
|
||||
#include <vector>
|
||||
|
||||
BEGIN_NAMESPACE
|
1
utils/LatAnalyze
Symbolic link
1
utils/LatAnalyze
Symbolic link
@ -0,0 +1 @@
|
||||
../lib
|
@ -1 +0,0 @@
|
||||
../latan
|
@ -1,8 +1,8 @@
|
||||
#include <iostream>
|
||||
#include <libgen.h>
|
||||
#include <unistd.h>
|
||||
#include <latan/AsciiFile.hpp>
|
||||
#include <latan/Dataset.hpp>
|
||||
#include <LatAnalyze/AsciiFile.hpp>
|
||||
#include <LatAnalyze/Dataset.hpp>
|
||||
|
||||
#ifndef DEF_NSAMPLE
|
||||
#define DEF_NSAMPLE 100
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include <iostream>
|
||||
#include <latan/AsciiFile.hpp>
|
||||
#include <latan/Plot.hpp>
|
||||
#include <LatAnalyze/AsciiFile.hpp>
|
||||
#include <LatAnalyze/Plot.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace Latan;
|
||||
|
Loading…
Reference in New Issue
Block a user