Skip to content

Commit

Permalink
Merge branch 'v0.50.1-release'
Browse files Browse the repository at this point in the history
Conflicts:
	doxygen/queso.page

Conflict was in the email address.  Trivial fix.
  • Loading branch information
dmcdougall committed May 15, 2014
2 parents 24313af + 6c8281a commit 28c5a5a
Show file tree
Hide file tree
Showing 112 changed files with 6,508 additions and 244 deletions.
Binary file modified QUESO_users_manual.pdf
Binary file not shown.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ After successfully running `configure`, type `make` to build the
Then type `make install` to install it in the directory previously
specified by the `--prefix` option of the `configure` script.

Documentation
-------------

`QUESO` documentation is available
[here](http://libqueso.github.io/queso/docs/html/).

Dependencies
------------

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.65)
AC_INIT([queso], [0.50.0], [[email protected]])
AC_INIT([queso], [0.50.1], [[email protected]])
AC_CONFIG_MACRO_DIR([m4])

AC_CONFIG_HEADERS(config_queso.h.tmp)
Expand Down
4 changes: 2 additions & 2 deletions doxygen/queso.dox.in
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ STRIP_FROM_INC_PATH =
# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.

SHORT_NAMES = NO
SHORT_NAMES = YES

# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
# will interpret the first line (until the first dot) of a JavaDoc-style
Expand Down Expand Up @@ -766,7 +766,7 @@ ALPHABETICAL_INDEX = YES
# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
# in which this list will be split (can be a number in the range [1..20])

COLS_IN_ALPHA_INDEX = 5
COLS_IN_ALPHA_INDEX = 2

# In case all classes in a project start with a common prefix, all
# classes will be put under the same header in the alphabetical index.
Expand Down
18 changes: 10 additions & 8 deletions doxygen/queso.page
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*! \mainpage The QUESO Library

<b>Version \version</b>, October 2009
<b>Version \version</b>, May 2014
<hr>

<b>Quantification of Uncertainty for Estimation, Simulation and Optimization (QUES0) </b>
<b>Quantification of Uncertainty for Estimation, Simulation and Optimization (QUESO) </b>

The QUESO library is a collection of C++ classes and algorithms to
support model validation and the prediction of quantities of interest
Expand All @@ -19,9 +19,11 @@ based/html format.

\section bugs Reporting Bugs

Bugs in the code and errors or omissions in the documentation can be
reported to [email protected]. Requests and contributions are
welcome at the same e-mail address.
Bugs in the code and errors or omissions in the documentation can be reported
to [email protected] or as a
<a href="https://github.com/libqueso/queso/issues/new>GitHub ticket</a>.
Requests and contributions are also welcome using either of the two methods
mentioned above.

All bug reports should include:
<ul>
Expand All @@ -38,12 +40,12 @@ All bug reports should include:
bot Coverage</a>

\section licence License
\copydoc License
See <a href="https://github.com/libqueso/queso/blob/master/LICENSE>here</a>.

\section acknowledgements Acknowledgments
\copydoc Acknowledgments

\section pecos-center More Information About PECOS
\copydoc About
See <a href="http://pecos.ices.utexas.edu/">here</a>.

*/
*/
68 changes: 67 additions & 1 deletion examples/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,73 @@ dist_gravity_gsl_DATA =
dist_gravity_gsl_DATA += $(gravity_gsl_DATA)
dist_gravity_gsl_DATA += ${gravity_gsl_HEADERS}
dist_gravity_gsl_DATA += ${gravity_gsl_SOURCES}


####################
# bimodal #
####################
bimodal_gsldir = $(prefix)/examples/bimodal

bimodal_gsl_DATA = $(top_srcdir)/examples/bimodal/tests/test_2013_12_02/bimodal_1chain.inp
bimodal_gsl_DATA += $(top_srcdir)/examples/bimodal/matlab/plot_all.m
bimodal_gsl_DATA += $(top_srcdir)/examples/bimodal/matlab/plot_likelihood.m
bimodal_gsl_DATA += $(top_srcdir)/examples/bimodal/matlab/plot_likelihood_normalized_taus.m
bimodal_gsl_DATA += $(top_srcdir)/examples/bimodal/matlab/plot_likelihood_unnormalized_taus.m
bimodal_gsl_DATA += $(top_srcdir)/examples/bimodal/src/Makefile_bimodal_violeta

bimodal_gsl_PROGRAMS = bimodal_gsl

bimodal_gsl_SOURCES = $(top_srcdir)/examples/bimodal/src/bimodal_main.C
bimodal_gsl_SOURCES += $(top_srcdir)/examples/bimodal/src/bimodal_compute.C
bimodal_gsl_SOURCES += $(top_srcdir)/examples/bimodal/src/bimodal_likelihood.C

bimodal_gsl_HEADERS = $(top_srcdir)/examples/bimodal/src/bimodal_compute.h
bimodal_gsl_HEADERS += $(top_srcdir)/examples/bimodal/src/bimodal_likelihood.h

bimodal_gsl_LDADD = $(top_builddir)/src/libqueso.la

bimodal_gsl_CPPFLAGS = -I$(top_srcdir)/examples/bimodal/src $(QUESO_CPPFLAGS)

dist_bimodal_gsl_DATA =
dist_bimodal_gsl_DATA += $(bimodal_gsl_DATA)
dist_bimodal_gsl_DATA += ${bimodal_gsl_HEADERS}
dist_bimodal_gsl_DATA += ${bimodal_gsl_SOURCES}

####################
# hysteretic #
####################
hysteretic_gsldir = $(prefix)/examples/hysteretic

hysteretic_gsl_DATA = $(top_srcdir)/examples/hysteretic/tests/test_2013_12_11/example.inp
hysteretic_gsl_DATA += $(top_srcdir)/examples/hysteretic/tests/test_2013_12_11/an.txt
hysteretic_gsl_DATA += $(top_srcdir)/examples/hysteretic/tests/test_2013_12_11/measured_data1_1.txt
hysteretic_gsl_DATA += $(top_srcdir)/examples/hysteretic/tests/test_2013_12_11/measured_data1_2.txt
hysteretic_gsl_DATA += $(top_srcdir)/examples/hysteretic/tests/test_2013_12_11/measured_data1_3.txt
hysteretic_gsl_DATA += $(top_srcdir)/examples/hysteretic/tests/test_2013_12_11/measured_data1_4.txt
hysteretic_gsl_DATA += $(top_srcdir)/examples/hysteretic/matlab/plot_all.m
hysteretic_gsl_DATA += $(top_srcdir)/examples/hysteretic/matlab/cpp_gen.m
hysteretic_gsl_DATA += $(top_srcdir)/examples/hysteretic/src/Makefile_hysteretic_violeta

hysteretic_gsl_PROGRAMS = hysteretic_gsl

hysteretic_gsl_SOURCES = $(top_srcdir)/examples/hysteretic/src/example_main.C
hysteretic_gsl_SOURCES += $(top_srcdir)/examples/hysteretic/src/example_compute.C
hysteretic_gsl_SOURCES += $(top_srcdir)/examples/hysteretic/src/example_likelihood.C
hysteretic_gsl_SOURCES += $(top_srcdir)/examples/hysteretic/src/example_hyst.C

hysteretic_gsl_HEADERS = $(top_srcdir)/examples/hysteretic/src/example_compute.h
hysteretic_gsl_HEADERS += $(top_srcdir)/examples/hysteretic/src/example_likelihood.h
hysteretic_gsl_HEADERS += $(top_srcdir)/examples/hysteretic/src/example_hyst.h

hysteretic_gsl_LDADD = $(top_builddir)/src/libqueso.la

hysteretic_gsl_CPPFLAGS = -I$(top_srcdir)/examples/hysteretic/src $(QUESO_CPPFLAGS)

dist_hysteretic_gsl_DATA =
dist_hysteretic_gsl_DATA += $(hysteretic_gsl_DATA)
dist_hysteretic_gsl_DATA += ${hysteretic_gsl_HEADERS}
dist_hysteretic_gsl_DATA += ${hysteretic_gsl_SOURCES}

####################
if CODE_COVERAGE_ENABLED
CLEANFILES = *.gcda *.gcno
endif
Expand Down
77 changes: 77 additions & 0 deletions examples/bimodal/matlab/plot_all.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
clear all;
%cd ../test/test_2013_12_02/outputData
cd outputData
rawChain_ml


% KDE estimation
fprintf(1,' Plotting KDE - theta <press any key>\n');
% [f,xi] = ksdensity(ip_ml_0_rawChain_unified(:,1),'function','pdf');
% plot(xi,f,'-m','linewidth',3);
% hold on; clear xi; clear f;
[f,xi] = ksdensity(ip_ml_1_rawChain_unified(:,1),'function','pdf');
plot(xi,f,'-r','linewidth',3);
hold on; clear xi; clear f;
[f,xi] = ksdensity(ip_ml_2_rawChain_unified(:,1),'function','pdf');
plot(xi,f,'-g','linewidth',3)
[f,xi] = ksdensity(ip_ml_3_rawChain_unified(:,1),'function','pdf');
plot(xi,f,'-b','linewidth',3)
[f,xi] = ksdensity(ip_ml_4_rawChain_unified(:,1),'function','pdf');
plot(xi,f,'-c','linewidth',3)
% h=legend('Level0','Level 1','Level 2','Level 3','Level 4','location','northeast');
h=legend('Level 1','Level 2','Level 3','Level 4','location','northeast');
title('\theta Kernel Density Estimation (raw chain)','fontname', 'Times', 'fontsize',20);
set(gca,'FontSize',16);
grid minor;
a=axis;
axis([-50 200 a(3) a(4)]);
hold off;
print -dpng bimodal_kde_rawchain
pause;
clf;

% CDF estimation
fprintf(1,' Plotting CDF - theta <press any key>\n');
[f,xi] = ksdensity(ip_ml_1_rawChain_unified(:,1),'function','cdf');
plot(xi,f,'-r','linewidth',3);
hold on; clear xi; clear f;
[f,xi] = ksdensity(ip_ml_2_rawChain_unified(:,1),'function','cdf');
plot(xi,f,'-g','linewidth',3)
clear xi; clear f;
[f,xi] = ksdensity(ip_ml_3_rawChain_unified(:,1),'function','cdf');
plot(xi,f,'-b','linewidth',3)
clear xi; clear f;
[f,xi] = ksdensity(ip_ml_4_rawChain_unified(:,1),'function','cdf');
plot(xi,f,'-c','linewidth',3)
clear xi; clear f;
h=legend('Level 1','Level 2','Level 3','Level 4','location','southeast');
title('\theta Cumulative Distribution Function (raw chain)','fontname', 'Times', 'fontsize',20);set(gca,'FontSize',16);
grid minor;
a=axis;
axis([-50 200 a(3) a(4)]);
hold off;
print -dpng bimodal_cdf_rawchain
pause;

% AUTOCORRELATION PLOTS
fprintf(1,' Plotting autocorrelation - theta <press any key>\n');
nlags=20;
i=1;
[ACF0,lags0,bounds]= autocorr(ip_ml_0_rawChain_unified(:,i), nlags, 0);
[ACF1,lags1,bounds]= autocorr(ip_ml_1_rawChain_unified(:,i), nlags, 0);
[ACF2,lags2,bounds]= autocorr(ip_ml_2_rawChain_unified(:,i), nlags, 0);
[ACF3,lags3,bounds]= autocorr(ip_ml_3_rawChain_unified(:,i), nlags, 0);
[ACF4,lags4,bounds]= autocorr(ip_ml_4_rawChain_unified(:,i), nlags, 0);
plot(ACF1,lags1,'-r',ACF2,lags2,'-g',ACF3,lags3,'-b',ACF4,lags4,'-c','linewidth',3);
h=legend('Level 1','Level 2','Level 3','Level 4','location','northeast');
set(gca,'FontSize',16);
grid minor;
ylabel('Autocorrelation', 'fontsize',16);
xlabel('Lag','fontname', 'Times', 'fontsize',16);
title('Autocorrelation - Parameter \theta','fontname', 'Times','fontsize',20);
print -dpng bimodal_autocorrelation_rawchain
pause;
clf;

%cd ../../../matlab
cd ..
26 changes: 26 additions & 0 deletions examples/bimodal/matlab/plot_likelihood.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
%cd ../test/test_2013_12_02/outputData
cd outputData

x=0.:.1:150.;

v1=1;
v2=25;

y1=(x-10).*(x-10)/(2*v1);
y2=(x-100).*(x-100)/(2*v2);

f1=(exp(-y1))/(sqrt(v1)*sqrt(2*pi));
f2=(exp(-y2))/(sqrt(v2)*sqrt(2*pi));

f=f1/2+f2/2;
plot(x,f,'k-','linewidth',2);
ylabel('f(\theta)','fontsize',16);
xlabel('\theta','fontsize',16);
grid minor
set(gca,'fontsize',16);
title('Bimodal likelihood function','fontsize',20);

print -dpng bimodal_likelihood.png

%cd ../../../matlab
cd ..
118 changes: 118 additions & 0 deletions examples/bimodal/matlab/plot_likelihood_normalized_taus.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
%cd ../test/test_2013_12_02/outputData
cd outputData

tau1 = 0.00585938; %in display_sub0.txt, look for first occurence of prevExponent after 'generateSequence(), level 2, step 3'
tau2 = 0.0524597; %in display_sub0.txt, look for first occurence of prevExponent after 'generateSequence(), level 3, step 3'
tau3 = 0.348566; %in display_sub0.txt, look for first occurence of prevExponent after 'generateSequence(), level 4, step 3'
tau4 = 1;

x=-50.:.1:200.;
[m,n]=size(x);
deltaX = (max(x)-min(x))/(n-1);
y1=(x-10).*(x-10)/(2*1);
y2=(x-100).*(x-100)/(2*25);
z1=(exp(-y1))/(1*sqrt(2*pi));
z2=(exp(-y2))/(5*sqrt(2*pi));

% Level 1------------------------------------------------------------------
z=((z1+ z2)/2).^tau1;
intZ = 0.;
for i=1:(n-1)
intZ = intZ + z(i)*deltaX;
end
intZ=intZ;

fprintf(1,'Level 1, area before normalization = %4.3f,',intZ);
z = z/intZ;
intZ = 0.;
for i=1:(n-1)
intZ = intZ + z(i)*deltaX;
end
intZ=intZ;
fprintf(1,'\t area after normalization = %4.3f\n',intZ);

x1=x;
f1=z;
clear z; clear intZ;

% Level 2------------------------------------------------------------------
z=((z1+ z2)/2).^tau2;
intZ = 0.;
for i=1:(n-1)
intZ = intZ + z(i)*deltaX;
end
intZ=intZ;

fprintf(1,'Level 2, area before normalization = %4.3f,',intZ);
z = z/intZ;
intZ = 0.;
for i=1:(n-1)
intZ = intZ + z(i)*deltaX;
end
intZ=intZ;
fprintf(1,'\t area after normalization = %4.3f\n',intZ);

x2=x;
f2=z;
clear z; clear intZ;

% Level 3------------------------------------------------------------------
z=((z1+ z2)/2).^tau3;
intZ = 0.;
for i=1:(n-1)
intZ = intZ + z(i)*deltaX;
end
intZ=intZ;

fprintf(1,'Level 3, area before normalization = %4.3f,',intZ);
z = z/intZ;
intZ = 0.;
for i=1:(n-1)
intZ = intZ + z(i)*deltaX;
end
intZ=intZ;
fprintf(1,'\t area after normalization = %4.3f\n',intZ);

x3=x;
f3=z;
clear z; clear intZ;

% Level 4------------------------------------------------------------------
z=((z1+ z2)/2).^tau4;
intZ = 0.;
for i=1:(n-1)
intZ = intZ + z(i)*deltaX;
end
intZ=intZ;

fprintf(1,'Level 4, area before normalization = %4.3f,',intZ);
z = z/intZ;
intZ = 0.;
for i=1:(n-1)
intZ = intZ + z(i)*deltaX;
end
intZ=intZ;
fprintf(1,'\t area after normalization = %4.3f\n',intZ);

x4=x;
f4=z;
% -------------------------------------------------------------------------
plot(x1,f1, '--r',x2,f2, '--g',x3,f3,'--b',x4,f4,'--c','linewidth',3)
set(gca,'fontsize',20);
a=axis;
axis([-50 200 a(3) .15]);
legend(['\tau = ', num2str(tau1)],...
['\tau = ', num2str(tau2)],...
['\tau = ', num2str(tau3)],...
['\tau = ', num2str(tau4)],...
'location','northeast');
ylabel('f^{\tau}(\theta)','fontsize',16);
xlabel('\theta','fontsize',16);
title('Intermediary normalized likelihood functions','fontname', 'Times', 'fontsize',20);
grid minor
set(gca,'fontsize',16);

print -dpng bimodal_likelihood_taus_normalized.png

%cd ../../../matlab
cd ..
Loading

0 comments on commit 28c5a5a

Please sign in to comment.