Skip to content

Commit 14b319a

Browse files
committed
Merge branch 'v0.50.0-release'
2 parents bb5f970 + 144b52e commit 14b319a

File tree

669 files changed

+56716
-54151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

669 files changed

+56716
-54151
lines changed

.gitignore

+27
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
.libs
55
*.gcda
66
*.gcno
7+
*~
78

89
Makefile.in
910
Makefile
@@ -15,6 +16,7 @@ aclocal.m4
1516
aminclude.am
1617
autom4te.cache
1718
build-aux
19+
.license.stamp
1820

1921
_configs.sed
2022
config.log
@@ -36,11 +38,20 @@ examples/exStatisticalInverseProblem_gsl
3638
examples/exTgaValidationCycle_gsl
3739
examples/gravity_gsl
3840
examples/tga2_gsl
41+
examples/gaussian_random_field
42+
examples/gaussian_random_field_genmesh
43+
examples/infinite_dim/inverse_options
44+
examples/infinite_dim/parallel_inverse_options
45+
examples/inverse_problem
46+
examples/operator
47+
examples/parallel_inverse_problem
3948

4049
src/core/inc/queso.h
4150
src/libqueso.la
4251
src/queso_version
4352

53+
inc/queso/*.h
54+
4455
test/gsl_tests/get_min_max_vec
4556
test/gsl_tests/get_set_row_column
4657
test/gsl_tests/input
@@ -67,3 +78,19 @@ test/test_uqGslMatrixConstructorFatal
6778
test/test_uqGslVector
6879
test/test_uqGslVectorConstructorFatal
6980
test/test_uqTeuchosVector
81+
test/chain0
82+
test/outputData
83+
test/test_Environment/copy_env
84+
test/test_DistArrayCopy
85+
test/test_DistArrayCtor
86+
test/test_DistArrayEquals
87+
test/test_DistArrayMisc
88+
test/test_GslVectorSpaceCtor
89+
test/test_GslVectorSpaceMisc
90+
test/test_IntersectionSubsetContains
91+
test/test_inf_gaussian
92+
test/test_inf_options
93+
test/test_infinite/inf_options
94+
test/test_operator
95+
test/test_uqexception
96+
test/test_SequenceOfVectorsErase

.travis.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: cpp
2+
compiler:
3+
- gcc
4+
- clang
5+
before_script:
6+
- sudo apt-get update -qq
7+
- sudo apt-get install -qq libgsl0-dev libmpich2-dev libboost-all-dev
8+
script: ./bootstrap && ./configure && make && make check

CHANGES

+12-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,21 @@ Version 0.47.1
1111
Version 0.47.0
1212
* removed example statisticalInverseProblem as it has a bug - it fails to recreate the problem described in the Normal test from Laine's MCMC tool: http://helios.fmi.fi/~lainema/mcmc/ex/normalex.html.
1313

14-
Version 0.47.0 (In progress)
14+
Version 0.50.0 (In progress)
1515

16-
* Migrated library to github
16+
* Implemented MCMC sampling on function spaces
17+
* Added function space MCMC unit tests
18+
* Added serial and parallel function space MCMC examples
1719
* Replace exit() calls with a macro exception handler
1820

21+
Version 0.47.1 (23 Sep 2013)
22+
23+
* Update manual and fix broken Makefile
24+
25+
Version 0.47.0 (4 Sep 2013)
26+
27+
* Migrated library to github
28+
1929
Version 0.46 (13 May 2013)
2030

2131
* changed libGRVY linkage to be optional

LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//-----------------------------------------------------------------------bl-
22
//--------------------------------------------------------------------------
3-
//
3+
//
44
// QUESO - a library to support the Quantification of Uncertainty
55
// for Estimation, Simulation and Optimization
66
//
@@ -17,7 +17,7 @@
1717
//
1818
// You should have received a copy of the GNU Lesser General Public
1919
// License along with this library; if not, write to the Free Software
20-
// Foundation, Inc. 51 Franklin Street, Fifth Floor,
20+
// Foundation, Inc. 51 Franklin Street, Fifth Floor,
2121
// Boston, MA 02110-1301 USA
2222
//
2323
//-----------------------------------------------------------------------el-

Makefile.am

+102-82
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 -I m4/common
33
EXTRA_DIST = $(DX_CONFIG) QUESO_users_manual.pdf CHANGES AUTHORS COPYING LICENSE
44

55
# Build in these directories:
6-
SUBDIRS = src/contrib/ANN src examples test/gsl_tests test doxygen
6+
SUBDIRS = inc/queso src/contrib/ANN src examples test/gsl_tests test doxygen
77

88
# Doxygen support
99

@@ -45,54 +45,61 @@ endif
4545

4646
# Files to be deleted by 'make maintainer-clean'
4747

48-
MAINTAINERCLEANFILES = \
49-
aclocal.m4 \
50-
autom4te.cache/* \
51-
$(AUX_DIST) \
52-
config.log \
53-
config.status \
54-
config.sub \
55-
configure \
56-
config.h \
57-
config.h.in \
58-
config_queso.h \
59-
config_queso.h.tmp.in \
60-
config_queso.h.tmp.in~ \
61-
Makefile.in \
62-
src/Makefile.in \
63-
src/contrib/ANN/Makefile.in \
64-
src/contrib/ANN/lib/Makefile.in \
65-
src/contrib/ANN/test/Makefile.in \
66-
src/core/Makefile.in \
67-
src/core/src/Makefile.in \
68-
src/core/inc/Makefile.in \
69-
src/misc/Makefile.in \
70-
src/misc/src/Makefile.in \
71-
src/misc/inc/Makefile.in \
72-
src/basic/Makefile.in \
73-
src/basic/src/Makefile.in \
74-
src/basic/inc/Makefile.in \
75-
src/stats/Makefile.in \
76-
src/stats/src/Makefile.in \
77-
src/stats/inc/Makefile.in \
78-
src/gp/Makefile.in \
79-
src/gp/src/Makefile.in \
80-
src/gp/inc/Makefile.in \
81-
examples/Makefile.in \
82-
examples/markovChain1/Makefile.in \
83-
examples/markovChain1/src/Makefile.in \
84-
examples/monteCarlo/Makefile.in \
85-
examples/monteCarlo/src/Makefile.in \
86-
examples/pyramid/Makefile.in \
87-
examples/pyramid/src/Makefile.in \
88-
examples/pyramid/src/physics_1/Makefile.in \
89-
examples/pyramid/src/physics_1_2/Makefile.in \
90-
examples/pyramid/src/physics_2/Makefile.in \
91-
examples/tga/Makefile.in \
92-
examples/tga/src/Makefile.in \
93-
examples/simpleStatisticalInverseProblem/src/Makefile.in \
94-
examples/simpleStatisticalForwardProblem/src/Makefile.in \
95-
doxygen/Makefile.in
48+
MAINTAINERCLEANFILES =
49+
MAINTAINERCLEANFILES += aclocal.m4
50+
MAINTAINERCLEANFILES += autom4te.cache/*
51+
MAINTAINERCLEANFILES += $(AUX_DIST)
52+
MAINTAINERCLEANFILES += config.log
53+
MAINTAINERCLEANFILES += config.status
54+
MAINTAINERCLEANFILES += config.sub
55+
MAINTAINERCLEANFILES += configure
56+
MAINTAINERCLEANFILES += config.h
57+
MAINTAINERCLEANFILES += config.h.in
58+
MAINTAINERCLEANFILES += config_queso.h
59+
MAINTAINERCLEANFILES += config_queso.h.tmp.in
60+
MAINTAINERCLEANFILES += config_queso.h.tmp.in~
61+
MAINTAINERCLEANFILES += Makefile.in
62+
MAINTAINERCLEANFILES += src/Makefile.in
63+
MAINTAINERCLEANFILES += src/contrib/ANN/Makefile.in
64+
MAINTAINERCLEANFILES += src/contrib/ANN/lib/Makefile.in
65+
MAINTAINERCLEANFILES += src/contrib/ANN/test/Makefile.in
66+
MAINTAINERCLEANFILES += src/core/Makefile.in
67+
MAINTAINERCLEANFILES += src/core/src/Makefile.in
68+
MAINTAINERCLEANFILES += src/core/inc/Makefile.in
69+
MAINTAINERCLEANFILES += src/misc/Makefile.in
70+
MAINTAINERCLEANFILES += src/misc/src/Makefile.in
71+
MAINTAINERCLEANFILES += src/misc/inc/Makefile.in
72+
MAINTAINERCLEANFILES += src/basic/Makefile.in
73+
MAINTAINERCLEANFILES += src/basic/src/Makefile.in
74+
MAINTAINERCLEANFILES += src/basic/inc/Makefile.in
75+
MAINTAINERCLEANFILES += src/stats/Makefile.in
76+
MAINTAINERCLEANFILES += src/stats/src/Makefile.in
77+
MAINTAINERCLEANFILES += src/stats/inc/Makefile.in
78+
MAINTAINERCLEANFILES += src/gp/Makefile.in
79+
MAINTAINERCLEANFILES += src/gp/src/Makefile.in
80+
MAINTAINERCLEANFILES += src/gp/inc/Makefile.in
81+
MAINTAINERCLEANFILES += inc/queso/Makefile.in
82+
MAINTAINERCLEANFILES += test/Makefile.in
83+
MAINTAINERCLEANFILES += test/gsl_tests/Makefile.in
84+
MAINTAINERCLEANFILES += test/t01_valid_cycle/Makefile.in
85+
MAINTAINERCLEANFILES += test/t02_sip_sfp/Makefile.in
86+
MAINTAINERCLEANFILES += test/t03_sequence/Makefile.in
87+
MAINTAINERCLEANFILES += test/t04_bimodal/Makefile.in
88+
MAINTAINERCLEANFILES += examples/Makefile.in
89+
MAINTAINERCLEANFILES += examples/markovChain1/Makefile.in
90+
MAINTAINERCLEANFILES += examples/markovChain1/src/Makefile.in
91+
MAINTAINERCLEANFILES += examples/monteCarlo/Makefile.in
92+
MAINTAINERCLEANFILES += examples/monteCarlo/src/Makefile.in
93+
MAINTAINERCLEANFILES += examples/pyramid/Makefile.in
94+
MAINTAINERCLEANFILES += examples/pyramid/src/Makefile.in
95+
MAINTAINERCLEANFILES += examples/pyramid/src/physics_1/Makefile.in
96+
MAINTAINERCLEANFILES += examples/pyramid/src/physics_1_2/Makefile.in
97+
MAINTAINERCLEANFILES += examples/pyramid/src/physics_2/Makefile.in
98+
MAINTAINERCLEANFILES += examples/tga/Makefile.in
99+
MAINTAINERCLEANFILES += examples/tga/src/Makefile.in
100+
MAINTAINERCLEANFILES += examples/simpleStatisticalInverseProblem/src/Makefile.in
101+
MAINTAINERCLEANFILES += examples/simpleStatisticalForwardProblem/src/Makefile.in
102+
MAINTAINERCLEANFILES += doxygen/Makefile.in
96103

97104
MOSTLYCLEANFILES = $(DX_CLEANFILES)
98105

@@ -104,39 +111,52 @@ MOSTLYCLEANFILES = $(DX_CLEANFILES)
104111

105112
# Additional files to be deleted by 'make distclean'
106113

107-
DISTCLEANFILES = _configs.sed \
108-
test/t01_valid_cycle/outputData/file_cal_fp_qoi2.m \
109-
test/t01_valid_cycle/outputData/file_cal_fp_qoi2_sub0.m \
110-
test/t01_valid_cycle/outputData/file_val_ip_raw2_sub0.m \
111-
test/t01_valid_cycle/outputData/file_cal_ip_raw2_sub0.m \
112-
test/t01_valid_cycle/outputData/file_cal_ip_raw2.m \
113-
test/t01_valid_cycle/outputData/file_val_fp_qoi2_sub0.m \
114-
test/t01_valid_cycle/outputData/screen_sub0.txt \
115-
test/t01_valid_cycle/outputData/file_val_fp_qoi2.m \
116-
test/t01_valid_cycle/outputData/file_val_ip_raw2.m \
117-
test/t01_valid_cycle/outputData/tgaValOutput_sub0.m \
118-
test/t01_valid_cycle/outputData/tgaCalOutput_sub0.m \
119-
test/t04_bimodal/outputData/display_sub0.txt \
120-
test/t04_bimodal/outputData/sipOutput_ml_sub0.m \
121-
test/t04_bimodal/outputData/filtChain_ml.m \
122-
test/t04_bimodal/outputData/rawChain_ml.m \
123-
test/gsl_tests/outputData/display_sub0.txt \
124-
test/gslvector_out_sub0.m \
125-
test/t02_sip_sfp/outputData/sfpOutput_sub0.m \
126-
test/t02_sip_sfp/outputData/ip_raw_chain_sub0.m \
127-
test/t02_sip_sfp/outputData/fp_p_seq.m \
128-
test/t02_sip_sfp/outputData/display_sub0.txt \
129-
test/t02_sip_sfp/outputData/nada1 \
130-
test/t02_sip_sfp/outputData/sipOutput_sub0.m \
131-
test/t02_sip_sfp/outputData/nada0 \
132-
test/t02_sip_sfp/outputData/ip_raw_chain.m \
133-
test/t02_sip_sfp/outputData/fp_q_seq.m \
134-
test/t02_sip_sfp/outputData/ip_filt_chain_sub0.m \
135-
test/t02_sip_sfp/outputData/fp_q_seq_sub0.m \
136-
test/t02_sip_sfp/outputData/ip_filt_chain.m \
137-
test/t02_sip_sfp/outputData/fp_p_seq_sub0.m \
138-
aminclude.am \
139-
config_queso.h
114+
DISTCLEANFILES =
115+
DISTCLEANFILES += _configs.sed
116+
DISTCLEANFILES += test/t01_valid_cycle/outputData/file_cal_fp_qoi2.m
117+
DISTCLEANFILES += test/t01_valid_cycle/outputData/file_cal_fp_qoi2_sub0.m
118+
DISTCLEANFILES += test/t01_valid_cycle/outputData/file_val_ip_raw2_sub0.m
119+
DISTCLEANFILES += test/t01_valid_cycle/outputData/file_cal_ip_raw2_sub0.m
120+
DISTCLEANFILES += test/t01_valid_cycle/outputData/file_cal_ip_raw2.m
121+
DISTCLEANFILES += test/t01_valid_cycle/outputData/file_val_fp_qoi2_sub0.m
122+
DISTCLEANFILES += test/t01_valid_cycle/outputData/screen_sub0.txt
123+
DISTCLEANFILES += test/t01_valid_cycle/outputData/file_val_fp_qoi2.m
124+
DISTCLEANFILES += test/t01_valid_cycle/outputData/file_val_ip_raw2.m
125+
DISTCLEANFILES += test/t01_valid_cycle/outputData/tgaValOutput_sub0.m
126+
DISTCLEANFILES += test/t01_valid_cycle/outputData/tgaCalOutput_sub0.m
127+
DISTCLEANFILES += test/t04_bimodal/outputData/display_sub0.txt
128+
DISTCLEANFILES += test/t04_bimodal/outputData/sipOutput_ml_sub0.m
129+
DISTCLEANFILES += test/t04_bimodal/outputData/filtChain_ml.m
130+
DISTCLEANFILES += test/t04_bimodal/outputData/rawChain_ml.m
131+
DISTCLEANFILES += test/gsl_tests/outputData/display_sub0.txt
132+
DISTCLEANFILES += test/gslvector_out_sub0.m
133+
DISTCLEANFILES += test/t02_sip_sfp/outputData/sfpOutput_sub0.m
134+
DISTCLEANFILES += test/t02_sip_sfp/outputData/ip_raw_chain_sub0.m
135+
DISTCLEANFILES += test/t02_sip_sfp/outputData/fp_p_seq.m
136+
DISTCLEANFILES += test/t02_sip_sfp/outputData/display_sub0.txt
137+
DISTCLEANFILES += test/t02_sip_sfp/outputData/nada1
138+
DISTCLEANFILES += test/t02_sip_sfp/outputData/sipOutput_sub0.m
139+
DISTCLEANFILES += test/t02_sip_sfp/outputData/nada0
140+
DISTCLEANFILES += test/t02_sip_sfp/outputData/ip_raw_chain.m
141+
DISTCLEANFILES += test/t02_sip_sfp/outputData/fp_q_seq.m
142+
DISTCLEANFILES += test/t02_sip_sfp/outputData/ip_filt_chain_sub0.m
143+
DISTCLEANFILES += test/t02_sip_sfp/outputData/fp_q_seq_sub0.m
144+
DISTCLEANFILES += test/t02_sip_sfp/outputData/ip_filt_chain.m
145+
DISTCLEANFILES += test/t02_sip_sfp/outputData/fp_p_seq_sub0.m
146+
DISTCLEANFILES += test/outputData/*
147+
DISTCLEANFILES += aminclude.am
148+
DISTCLEANFILES += config_queso.h
149+
150+
CLEANFILES =
151+
if GIT_CLONE
152+
CLEANFILES += src/.license.stamp
153+
CLEANFILES += test/.license.stamp
154+
CLEANFILES += test/gsl_tests/.license.stamp
155+
CLEANFILES += test/t01_valid_cycle/.license.stamp
156+
CLEANFILES += test/t02_sip_sfp/.license.stamp
157+
CLEANFILES += test/t03_sequence/.license.stamp
158+
CLEANFILES += test/t04_bimodal/.license.stamp
159+
endif
140160

141161
# Required for AX_AM_MACROS
142162
#@INC_AMINCLUDE@

README

-42
This file was deleted.

0 commit comments

Comments
 (0)