Commit d407c036 authored by thomas.forbriger's avatar thomas.forbriger
Browse files

[MERGE][API][FIX] (ticket10): merge with commit ticket10tsxx

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.

  2ec11b5 [WP][FIX][API] (ticket10tsxx): provide tested snapshot tar-ball
  4723b0b [WP][DOC] (ticket10tsxx): note API modification in doxygen documentation
  7081d0a [WP][DOC] (ticket10tsxx): provide proper copying information
  20e5bfa [WP][TASK] (ticket10tsxx): group entries in flist

Merge branch 'ticket10tsxx' into ticket10

Conflicts:
	src/README.dependencies

libtsxx is disentangled from libtfxx
snapshot packages are provided and tested

Missing:
  - libtsioxx must also be made available
  - all application programs must be adjusted to the new interface provided by
    libtsxx and respective modules must be directed to libtsioxx
parents b8fd633f cb28b4fc
...@@ -2,7 +2,7 @@ this is <README.dependencies> ...@@ -2,7 +2,7 @@ this is <README.dependencies>
============================================================================ ============================================================================
library dependencies library dependencies
-------------------- --------------------
$Id: README.dependencies 5425 2014-01-06 16:08:10Z tmetz $ $Id$
============================================================================ ============================================================================
This file tells you on which libraries/modules the different software This file tells you on which libraries/modules the different software
...@@ -103,11 +103,10 @@ C++ libraries ...@@ -103,11 +103,10 @@ C++ libraries
language: C++ language: C++
libraries: libtsxx.a libraries: libtsxx.a
external dependencies: - external dependencies: -
internal dependencies: libtfxx libgsexx libtime++ libseife libaff internal dependencies: libgsexx libtime++ libseife libaff
libdatrwxx libsffxx libdatrwxx libsffxx
checked: 16.10.2010 (tforb) test program dependency: libtfxx
!! comment: there are many dependencies on libtfxx which probably should not checked: 28.01.2014 (tforb)
be here
liblinearxx liblinearxx
language: C++ language: C++
libraries: liblinearxx.a libraries: liblinearxx.a
......
this is <COPYING> this is <COPYING>
============================================================================ ============================================================================
libtsxx libtsxx: time series filters, tapers, etc.
------ ------------------------------------------
$Id$ $Id$
========================================================================= =========================================================================
Copyright (c) 2003,2012 by Thomas Forbriger (BFO Schiltach)
Copyright (c) 2003-2007, 2011, 2012, 2014 by Thomas Forbriger (BFO Schiltach)
The source code and other files in this directory are part of libtsxx which The source code and other files in this directory are part of libtsxx which
compiles to the binary libraries ibtsxx.a and ibtsxx.so. compiles to the binary libraries ibtsxx.a and ibtsxx.so.
libtsxx offers a basic code to handle time series analysis. libtsxx offers code for handle time series analysis, i.e. waveform filters,
tapers, interpolation, etc.
libtsxx is free software; you can redistribute it and/or modify libtsxx is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, libtsxx is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
......
...@@ -88,9 +88,9 @@ LIBINSTALLPATH=$(LOCLIBDIR) ...@@ -88,9 +88,9 @@ LIBINSTALLPATH=$(LOCLIBDIR)
INSTHEADER=$(addprefix $(INCINSTALLPATH)/,$(notdir $(HEADERS))) INSTHEADER=$(addprefix $(INCINSTALLPATH)/,$(notdir $(HEADERS)))
# whereever we find a README, we will use it # whereever we find a README, we will use it
README=$(shell find . -name README) README=README
# the frame of doxygen documentation is palced in text files # the frame of doxygen documentation is palced in text files
DOXYTXT=$(shell find . -name doxygen\*.txt) DOXYTXT=$(wildcard doxygen\*.txt)
# #
# general part # general part
...@@ -102,8 +102,15 @@ CXXFLAGS+=-fPIC -Wall $(FLAGS) ...@@ -102,8 +102,15 @@ CXXFLAGS+=-fPIC -Wall $(FLAGS)
LDFLAGS+=-L$(LOCLIBDIR) LDFLAGS+=-L$(LOCLIBDIR)
CPPFLAGS+=-I$(LOCINCLUDEDIR) $(FLAGS) CPPFLAGS+=-I$(LOCINCLUDEDIR) $(FLAGS)
flist: Makefile $(wildcard *.h *.cc *.cfg) $(README) $(DOXYTXT) COPYING CODEFILES=$(wildcard *.h *.cc)
echo $^ | tr ' ' '\n' | sort > $@ OTHERFILES=Makefile $(wildcard *.cfg) $(README) COPYING $(DOXYTXT)
flist: $(CODEFILES) $(OTHERFILES) $(TF_EDIT)
echo $(OTHERFILES) | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(CODEFILES) | tr ' ' '\n' | sort >> $@
echo '----' >> $@
echo $(filter-out $(CODEFILES) $(OTHERFILES),$^) \
| tr ' ' '\n' | sort >> $@
.PHONY: edit .PHONY: edit
edit: flist; vim $< edit: flist; vim $<
...@@ -111,7 +118,7 @@ edit: flist; vim $< ...@@ -111,7 +118,7 @@ edit: flist; vim $<
.PHONY: clean .PHONY: clean
clean: ; clean: ;
-find . -name \*.bak | xargs --no-run-if-empty /bin/rm -v -find . -name \*.bak | xargs --no-run-if-empty /bin/rm -v
-/bin/rm -vf flist *.d *.o tsxx_tests *.s *.so *.xxx -/bin/rm -vf flist *.d *.o tsxx_tests *.s *.so *.xxx *.hd
#====================================================================== #======================================================================
# pattern rules # pattern rules
...@@ -187,7 +194,7 @@ DOXYWWWPATH=$(TF_WWWBASEDIR)/libtsxx ...@@ -187,7 +194,7 @@ DOXYWWWPATH=$(TF_WWWBASEDIR)/libtsxx
doxyclean: ;/bin/rm -rfv $(DOXYWWWPATH) doxydoc.xxx doxyclean: ;/bin/rm -rfv $(DOXYWWWPATH) doxydoc.xxx
DOXYSRC=$(LIBSRC) $(HEADERS) $(DOXTXT) DOXYSRC=$(LIBSRC) $(HEADERS) $(DOXYTXT)
# create doxygen intermediate configuration # create doxygen intermediate configuration
PWD=$(shell env pwd) PWD=$(shell env pwd)
...@@ -223,9 +230,9 @@ package: $(TF_MAKEPKG) ...@@ -223,9 +230,9 @@ package: $(TF_MAKEPKG)
fullpackage: $(TF_MAKEPKG) fullpackage: $(TF_MAKEPKG)
$(MAKE) -f $< \ $(MAKE) -f $< \
PACKAGE=libtsxxwithlibs \ PACKAGE=libtsxxwithlibs \
PACKAGEEXPORT="trunk/src/libs/libtsxx:src trunk/src/libs/libtfxx:contrib/libtfxx" \ PACKAGEEXPORT="trunk/src/libs/libtsxx:src" \
PACKAGETARGETS=" contrib/libtfxx:install:-i src:install:-i contrib/libtfxx:reinstall contrib/libtfxx:doc:-i src:install src:doc" \ PACKAGETARGETS="contrib/libtfxx:all" \
PACKAGELIBS="libaff libgsexx libtime libseife libdatrwxx libsffxx libsff" PACKAGELIBS="libaff libgsexx libtime libseife libdatrwxx libsffxx"
endif endif
......
this is <README> this is <README>
============================================================================ ============================================================================
TSXX --- basic code to handle time series analysis libtsxx: time series filters, tapers, etc.
-------------------------------------------------- ------------------------------------------
$Id$ $Id$
============================================================================ ============================================================================
For compilation instructions see README.1st in the root directory of the tar-ball or For compilation instructions see README.1st in the root directory of the
tar-ball or
http://gpitrsvn.gpi.uni-karlsruhe.de:8000/TFSoftware/wiki/docs/installation http://gpitrsvn.gpi.uni-karlsruhe.de:8000/TFSoftware/wiki/docs/installation
This library provides modules for time series analysis. This library provides modules for time series analysis. In particular this are
In particular this are functions that also need seismic trace header data functions that also need seismic trace header data (like the sampling
(like the sampling interval) additional to the time series samples interval) additional to the time series samples themselves. Provided are
themselves. recursive filters (i.e. an interface to seife), FIR decimating filters,
Provided are recursive filters (i.e. an interface to seife), FIR decimating interpolation filters, tapers, containers for time series data together with
filters, interpolation filters, tapers, containers for time series data header data, and more.
together with header data, and more.
Installation Installation
------------ ------------
...@@ -31,11 +31,22 @@ Installation ...@@ -31,11 +31,22 @@ Installation
make all installs headers, binary libraries and documentation make all installs headers, binary libraries and documentation
Dependencies Dependencies:
------------ -------------
Other libraries that are required to compile libtsxx: Compilers required to build the programs:
libaff, libgsexx, libtime, libdatrwxx, libsffxx, libcseife C++ compiler
The test porgram additionally requires libtfxx C/C++ preprocessor
doxygen (required to process source code documentation)
TFSoftware libraries required to compile the code:
direct dependencies:
libaff, libgsexx, libtime, libdatrwxx, libsffxx, libcseife
the test program additionally requires:
libtfxx
Further non-standard libraries required to compile the code:
- the C++ standard template library (STL)
- libgsl (libgsl, libgslcblas)
Detailed documentation is provided through doxygen source code. See target Detailed documentation is provided through doxygen source code. See target
doxydoc in the Makefile. doxydoc in the Makefile.
......
...@@ -28,15 +28,16 @@ ...@@ -28,15 +28,16 @@
* ---- * ----
* *
* REVISIONS and CHANGES * REVISIONS and CHANGES
* - 13/03/2011 V1.0 Thomas Forbriger * - 13/03/2011 V1.0 Thomas Forbriger (thof)
* - 18/07/2013 V1.1 tmetz (renamed file) * - 18/07/2013 V1.1 tmetz (renamed file)
* - 28/01/2014 (thof) make a note regarding change in API
* ============================================================================ * ============================================================================
*/ */
/*! \mainpage /*! \mainpage
* *
* \author Thomas Forbriger * \author Thomas Forbriger
* \date $Date$ * \date 28/01/2014
* \since 2003 * \since 2003
* \version $Id$ * \version $Id$
* *
...@@ -65,9 +66,13 @@ ...@@ -65,9 +66,13 @@
- random.h - random.h
- seifeclass.h - seifeclass.h
- seifexx.h - seifexx.h
- sffheaders.h
- tapers.h - tapers.h
- tsxx.h - tsxx.h
\note
The interface provided in sffheaders.h an associated files were moved to
libtsioxx in order to disentangle libtsxx and libtfxx.
(thof, 28/01/2014)
*/ */
/* ----- END OF doxygen.txt ----- */ /* ----- END OF doxygen.txt ----- */
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