From e77fc13a66917accb0ea00e0607c281bf6e2f0de Mon Sep 17 00:00:00 2001 From: "Per.Andreas.Brodtkorb" Date: Mon, 12 Jul 2010 15:58:23 +0000 Subject: [PATCH] Revised the setup script --- pywafo/setup.py | 13 +++++- pywafo/src/Wafo.egg-info/PKG-INFO | 59 +++++++++++----------------- pywafo/src/Wafo.egg-info/SOURCES.txt | 4 +- pywafo/src/wafo/info.py | 54 ++++++++----------------- 4 files changed, 54 insertions(+), 76 deletions(-) diff --git a/pywafo/setup.py b/pywafo/setup.py index 0bcdcd3..57b9d8e 100644 --- a/pywafo/setup.py +++ b/pywafo/setup.py @@ -58,13 +58,22 @@ setup( author_email='wafo@maths.lth.se', decription = 'Statistical analysis and simulation of random waves and random loads', long_description = info.__doc__, - install_requires = ['numpy>=1.4'], + install_requires = ['numpy>=1.4','numdifftools>=0.2'], license = "GPL", - url='http://www.maths.lth.se/matstat/wafo/', + url='http://code.google.com/p/pywafo/', name = pkg_name, package_dir = {'': 'src'}, packages = find_packages('src'), package_data = {'': packagedata}, + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Education', + 'Intended Audience :: Science/Research', + 'License :: OSI Approved :: GNU General Public License (GPL)', + 'Operating System :: Microsoft :: Windows', + 'Programming Language :: Python :: 2.6', + 'Topic :: Scientific/Engineering :: Mathematics', + ], #packages = [package_name,] + list(subpackagesfull), #package_data = {package_name: packagedata}, #package_data = {'': ['wafo.cfg']}, diff --git a/pywafo/src/Wafo.egg-info/PKG-INFO b/pywafo/src/Wafo.egg-info/PKG-INFO index d936183..6c9f910 100644 --- a/pywafo/src/Wafo.egg-info/PKG-INFO +++ b/pywafo/src/Wafo.egg-info/PKG-INFO @@ -2,13 +2,13 @@ Metadata-Version: 1.0 Name: wafo Version: 0.11 Summary: UNKNOWN -Home-page: http://www.maths.lth.se/matstat/wafo/ +Home-page: http://code.google.com/p/pywafo/ Author: WAFO-group Author-email: wafo@maths.lth.se License: GPL Description: WAFO - ===== + ==== WAFO is a toolbox Python routines for statistical analysis and simulation of random waves and random loads. WAFO is freely redistributable software, see WAFO licence, cf. the GNU General Public License (GPL) and contain tools for: @@ -30,57 +30,37 @@ Description: -Kernel density estimation -Hidden markov models - WAFO consists of several modules with short descriptions below. - The modules SPECTRUM, COVARIANCE, TRANSFORM, WAVEMODELS, and MULTIDIM are - mainly for oceanographic applications. - The modules CYCLES, MARKOV, and DAMAGE are mainly for fatigue problems. - The contents file for each module is shown by typing 'help module-name' - Type 'help fatigue' for a presentation of all routines related to fatigue. + WAFO consists of several subpackages and classes with short descriptions below. - The paths to the modules are initiated by the function 'initwafo'. - - ONEDIM - Data analysis of time series. Example: extraction of + Classes: + TimeSeries - Data analysis of time series. Example: extraction of turning points, estimation of spectrum and covariance function. Estimation transformation used in transformed Gaussian model. - COVARIANCE - Computation of spectral functions, linear + CovData - Computation of spectral functions, linear and non-linear time series simulation. - SPECTRUM - Computation of spectral moments and covariance functions, linear + SpecData - Computation of spectral moments and covariance functions, linear and non-linear time series simulation. Ex: common spectra implemented, directional spectra, bandwidth measures, exact distributions for wave characteristics. - TRANSFORM - Modelling with linear or transformed Gaussian waves. Ex: - - WAVEMODELS - Models for distributions of wave characteristics found in - the literature. Ex: parametric models for breaking - limited wave heights. - MULTIDIM - Multi-dimensional time series analysis. (Under construction) - CYCLES - Cycle counting, discretization, and crossings, calculation of + + + CyclePairs - Cycle counting, discretization, and crossings, calculation of damage. Simulation of discrete Markov chains, switching Markov chains, harmonic oscillator. Ex: Rainflow cycles and matrix, discretization of loads. Damage of a rainflow count or matrix, damage matrix, S-N plot. - MARKOV - Routines for Markov loads, switching Markov loads, and - their connection to rainflow cycles. - DAMAGE - Calculation of damage. Ex: Damage of a rainflow count or - matrix, damage matrix, S-N plot. - SIMTOOLS - Simulation of random processes. Ex: spectral simulation, - simulation of discrete Markov chains, switching Markov - chains, harmonic oscillator - STATISTICS - Statistical tools and extreme-value distributions. + + + Subpackages: + TRANSFORM - Modelling with linear or transformed Gaussian waves. Ex: + STATS - Statistical tools and extreme-value distributions. Ex: generation of random numbers, estimation of parameters, evaluation of pdf and cdf KDETOOLS - Kernel-density estimation. - MISC - Miscellaneous routines. Ex: numerical integration, smoothing - spline, binomial coefficient, water density. - WDEMOS - WAFO demos. + MISC - Miscellaneous routines. DOCS - Documentation of toolbox, definitions. An overview is given in the routine wafomenu. DATA - Measurements from marine applications. - PAPERS - Commands that generate figures in selected scientific - publications. - SOURCE - Fortran and C files. Information on compilation. - EXEC - Executable files (cf. SOURCE), pre-compiled for Solaris, - Alpha-Dec or Windows. WAFO homepage: On the WAFO home page you will find: @@ -90,3 +70,10 @@ Description: - List of publications related to WAFO. Platform: UNKNOWN +Classifier: Development Status :: 4 - Beta +Classifier: Intended Audience :: Education +Classifier: Intended Audience :: Science/Research +Classifier: License :: OSI Approved :: GNU General Public License (GPL) +Classifier: Operating System :: Microsoft :: Windows +Classifier: Programming Language :: Python :: 2.6 +Classifier: Topic :: Scientific/Engineering :: Mathematics diff --git a/pywafo/src/Wafo.egg-info/SOURCES.txt b/pywafo/src/Wafo.egg-info/SOURCES.txt index 9a68a5c..b9e67fc 100644 --- a/pywafo/src/Wafo.egg-info/SOURCES.txt +++ b/pywafo/src/Wafo.egg-info/SOURCES.txt @@ -38,7 +38,6 @@ src/wafo/rindmod.pyd src/wafo/sg_filter.py src/wafo/test_ppimport.py src/wafo/wafodata.py -src/wafo/weaver.py src/wafo.egg-info/SOURCES.txt src/wafo/covariance/__init__.py src/wafo/covariance/core.py @@ -64,6 +63,7 @@ src/wafo/source/c_codes/build_all.py src/wafo/source/c_codes/c_functions.c src/wafo/source/c_codes/c_library.pyd src/wafo/source/c_codes/c_library.pyf +src/wafo/source/c_codes/old/build_all_.py src/wafo/source/c_codes/old/diffsumfunq.pyd src/wafo/source/c_codes/old/diffsumfunq.pyf src/wafo/source/c_codes/old/disufq.pyf @@ -84,6 +84,7 @@ src/wafo/source/cov2XXXpdf/bounds/cov2acdfb.f src/wafo/source/cov2XXXpdf/bounds/cov2mmpdfb.f src/wafo/source/cov2XXXpdf/bounds/cov2tccpdfb.f src/wafo/source/cov2XXXpdf/bounds/cov2tthpdfb.f +src/wafo/source/mreg/build_all_.py src/wafo/source/mreg/checkmod.mod src/wafo/source/mreg/cov2mmpdfmod.mod src/wafo/source/mreg/cov2mmpdfreg.f @@ -260,6 +261,7 @@ src/wafo/spectrum/models.py src/wafo/stats/__init__.py src/wafo/stats/core.py src/wafo/stats/distributions.py +src/wafo/stats/distributions_juli2010.py src/wafo/stats/estimation.py src/wafo/stats/misc.py src/wafo/stats/plotbackend.py diff --git a/pywafo/src/wafo/info.py b/pywafo/src/wafo/info.py index 0689094..291fc8a 100644 --- a/pywafo/src/wafo/info.py +++ b/pywafo/src/wafo/info.py @@ -1,6 +1,6 @@ """ WAFO -===== +==== WAFO is a toolbox Python routines for statistical analysis and simulation of random waves and random loads. WAFO is freely redistributable software, see WAFO licence, cf. the GNU General Public License (GPL) and contain tools for: @@ -22,57 +22,37 @@ Statistics -Kernel density estimation -Hidden markov models - WAFO consists of several modules with short descriptions below. - The modules SPECTRUM, COVARIANCE, TRANSFORM, WAVEMODELS, and MULTIDIM are - mainly for oceanographic applications. - The modules CYCLES, MARKOV, and DAMAGE are mainly for fatigue problems. - The contents file for each module is shown by typing 'help module-name' - Type 'help fatigue' for a presentation of all routines related to fatigue. - - The paths to the modules are initiated by the function 'initwafo'. - - ONEDIM - Data analysis of time series. Example: extraction of + WAFO consists of several subpackages and classes with short descriptions below. + + Classes: + TimeSeries - Data analysis of time series. Example: extraction of turning points, estimation of spectrum and covariance function. Estimation transformation used in transformed Gaussian model. - COVARIANCE - Computation of spectral functions, linear + CovData - Computation of spectral functions, linear and non-linear time series simulation. - SPECTRUM - Computation of spectral moments and covariance functions, linear + SpecData - Computation of spectral moments and covariance functions, linear and non-linear time series simulation. Ex: common spectra implemented, directional spectra, bandwidth measures, exact distributions for wave characteristics. - TRANSFORM - Modelling with linear or transformed Gaussian waves. Ex: - - WAVEMODELS - Models for distributions of wave characteristics found in - the literature. Ex: parametric models for breaking - limited wave heights. - MULTIDIM - Multi-dimensional time series analysis. (Under construction) - CYCLES - Cycle counting, discretization, and crossings, calculation of + + + CyclePairs - Cycle counting, discretization, and crossings, calculation of damage. Simulation of discrete Markov chains, switching Markov chains, harmonic oscillator. Ex: Rainflow cycles and matrix, discretization of loads. Damage of a rainflow count or - matrix, damage matrix, S-N plot. - MARKOV - Routines for Markov loads, switching Markov loads, and - their connection to rainflow cycles. - DAMAGE - Calculation of damage. Ex: Damage of a rainflow count or - matrix, damage matrix, S-N plot. - SIMTOOLS - Simulation of random processes. Ex: spectral simulation, - simulation of discrete Markov chains, switching Markov - chains, harmonic oscillator - STATISTICS - Statistical tools and extreme-value distributions. + matrix, damage matrix, S-N plot. + + +Subpackages: + TRANSFORM - Modelling with linear or transformed Gaussian waves. Ex: + STATS - Statistical tools and extreme-value distributions. Ex: generation of random numbers, estimation of parameters, evaluation of pdf and cdf KDETOOLS - Kernel-density estimation. - MISC - Miscellaneous routines. Ex: numerical integration, smoothing - spline, binomial coefficient, water density. - WDEMOS - WAFO demos. + MISC - Miscellaneous routines. DOCS - Documentation of toolbox, definitions. An overview is given in the routine wafomenu. DATA - Measurements from marine applications. - PAPERS - Commands that generate figures in selected scientific - publications. - SOURCE - Fortran and C files. Information on compilation. - EXEC - Executable files (cf. SOURCE), pre-compiled for Solaris, - Alpha-Dec or Windows. WAFO homepage: On the WAFO home page you will find: