From 9ab04f33232604772e01319984bdc4ae4a1d7066 Mon Sep 17 00:00:00 2001 From: sebastien Date: Fri, 23 Oct 2009 09:07:47 +0000 Subject: [PATCH] Renamed kordepert to k_order_perturbation git-svn-id: https://www.dynare.org/svn/dynare/trunk@3070 ac1d8469-bf42-47a9-8791-bf33cf982152 --- matlab/dynare_config.m | 2 +- mex/build/{korderpert.am => k_order_perturbation.am} | 8 ++++---- mex/build/matlab/Makefile.am | 2 +- mex/build/matlab/configure.ac | 4 ++-- .../{korderpert => k_order_perturbation}/Makefile.am | 2 +- mex/build/octave/Makefile.am | 2 +- mex/build/octave/configure.ac | 4 ++-- .../{korderpert => k_order_perturbation}/Makefile.am | 2 +- .../{korderpert => k_order_perturbation}/Readme.txt | 0 .../{korderpert => k_order_perturbation}/dynamic_dll.cpp | 0 .../{korderpert => k_order_perturbation}/dynamic_dll.h | 0 .../{korderpert => k_order_perturbation}/k_ord_dynare.cpp | 0 .../{korderpert => k_order_perturbation}/k_ord_dynare.h | 0 .../k_order_perturbation.cpp | 0 .../tests/first_order.m | 0 .../tests/fs2000k.mod | 0 .../tests/k_order_test_main.cpp | 0 17 files changed, 13 insertions(+), 13 deletions(-) rename mex/build/{korderpert.am => k_order_perturbation.am} (80%) rename mex/build/matlab/{korderpert => k_order_perturbation}/Makefile.am (58%) rename mex/build/octave/{korderpert => k_order_perturbation}/Makefile.am (55%) rename mex/sources/{korderpert => k_order_perturbation}/Readme.txt (100%) rename mex/sources/{korderpert => k_order_perturbation}/dynamic_dll.cpp (100%) rename mex/sources/{korderpert => k_order_perturbation}/dynamic_dll.h (100%) rename mex/sources/{korderpert => k_order_perturbation}/k_ord_dynare.cpp (100%) rename mex/sources/{korderpert => k_order_perturbation}/k_ord_dynare.h (100%) rename mex/sources/{korderpert => k_order_perturbation}/k_order_perturbation.cpp (100%) rename mex/sources/{korderpert => k_order_perturbation}/tests/first_order.m (100%) rename mex/sources/{korderpert => k_order_perturbation}/tests/fs2000k.mod (100%) rename mex/sources/{korderpert => k_order_perturbation}/tests/k_order_test_main.cpp (100%) diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m index 1808bc872..e83e3f475 100644 --- a/matlab/dynare_config.m +++ b/matlab/dynare_config.m @@ -170,7 +170,7 @@ end disp([ message 'Bytecode evaluation.' ]) % Test if k-order perturbation DLL is present -if exist('korderpert') == 3 +if exist('k_order_perturbation') == 3 remove_path_to_mex = 0; message = '[mex] '; else diff --git a/mex/build/korderpert.am b/mex/build/k_order_perturbation.am similarity index 80% rename from mex/build/korderpert.am rename to mex/build/k_order_perturbation.am index 26dce99b7..239e767b2 100644 --- a/mex/build/korderpert.am +++ b/mex/build/k_order_perturbation.am @@ -1,8 +1,8 @@ -vpath %.cpp $(top_srcdir)/../../sources/korderpert $(top_srcdir)/../../../dynare++/sylv/cc $(top_srcdir)/../../../dynare++/tl/cc $(top_srcdir)/../../../dynare++/kord $(top_srcdir)/../../../dynare++/integ/cc $(top_srcdir)/../../../dynare++/src +vpath %.cpp $(top_srcdir)/../../sources/k_order_perturbation $(top_srcdir)/../../../dynare++/sylv/cc $(top_srcdir)/../../../dynare++/tl/cc $(top_srcdir)/../../../dynare++/kord $(top_srcdir)/../../../dynare++/integ/cc $(top_srcdir)/../../../dynare++/src -noinst_PROGRAMS = korderpert +noinst_PROGRAMS = k_order_perturbation -# Can't use korderpert_CPPFLAGS, because it interacts badly with VPATH +# Can't use k_order_perturbation_CPPFLAGS, because it interacts badly with VPATH CPPFLAGS += -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources CXXFLAGS += $(PTHREAD_CFLAGS) @@ -72,7 +72,7 @@ INTEG_SRCS = \ smolyak.cpp \ vector_function.cpp -nodist_korderpert_SOURCES = \ +nodist_k_order_perturbation_SOURCES = \ k_order_perturbation.cpp \ k_ord_dynare.cpp \ k_ord_dynare.h \ diff --git a/mex/build/matlab/Makefile.am b/mex/build/matlab/Makefile.am index 4e15cb11c..ac99288bc 100644 --- a/mex/build/matlab/Makefile.am +++ b/mex/build/matlab/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../m4 if DO_SOMETHING -SUBDIRS = mjdgges gensylv kronecker bytecode korderpert +SUBDIRS = mjdgges gensylv kronecker bytecode k_order_perturbation endif EXTRA_DIST = mex.def mexFunction-MacOSX.map diff --git a/mex/build/matlab/configure.ac b/mex/build/matlab/configure.ac index 43c80328b..22f7f02fb 100644 --- a/mex/build/matlab/configure.ac +++ b/mex/build/matlab/configure.ac @@ -49,7 +49,7 @@ AC_PROG_CC AC_PROG_CXX AX_PROG_LN_S AX_PTHREAD -# Check for dlopen(), needed by korderpert DLL +# Check for dlopen(), needed by k_order_perturbation DLL AC_CHECK_LIB([dl], [dlopen], [LIBADD_DLOPEN="-ldl"], []) AC_SUBST([LIBADD_DLOPEN]) @@ -60,7 +60,7 @@ AC_CONFIG_FILES([Makefile kronecker/Makefile gensylv/Makefile bytecode/Makefile - korderpert/Makefile]) + k_order_perturbation/Makefile]) if test "x$ax_enable_matlab" = "xyes" -a "x$ax_matlab_version_ok" = "xyes" -a "x$ax_mexopts_ok" = "xyes"; then if test x"$ax_pthread_ok" = "xyes"; then diff --git a/mex/build/matlab/korderpert/Makefile.am b/mex/build/matlab/k_order_perturbation/Makefile.am similarity index 58% rename from mex/build/matlab/korderpert/Makefile.am rename to mex/build/matlab/k_order_perturbation/Makefile.am index d79f52999..5c05812bd 100644 --- a/mex/build/matlab/korderpert/Makefile.am +++ b/mex/build/matlab/k_order_perturbation/Makefile.am @@ -1,4 +1,4 @@ include ../mex.am -include ../../korderpert.am +include ../../k_order_perturbation.am CPPFLAGS += -DMEXEXT=\"$(MEXEXT)\" diff --git a/mex/build/octave/Makefile.am b/mex/build/octave/Makefile.am index 7a206ecc8..3bbb96603 100644 --- a/mex/build/octave/Makefile.am +++ b/mex/build/octave/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I ../../../m4 if DO_SOMETHING -SUBDIRS = mjdgges gensylv kronecker bytecode korderpert +SUBDIRS = mjdgges gensylv kronecker bytecode k_order_perturbation endif diff --git a/mex/build/octave/configure.ac b/mex/build/octave/configure.ac index 936cefaca..6b6fc0f10 100644 --- a/mex/build/octave/configure.ac +++ b/mex/build/octave/configure.ac @@ -35,7 +35,7 @@ AC_PROG_CC AC_PROG_CXX AX_PROG_LN_S AX_PTHREAD -# Check for dlopen(), needed by korderpert DLL +# Check for dlopen(), needed by k_order_perturbation DLL AC_CHECK_LIB([dl], [dlopen], [LIBADD_DLOPEN="-ldl"], []) AC_SUBST([LIBADD_DLOPEN]) @@ -65,6 +65,6 @@ AC_CONFIG_FILES([Makefile kronecker/Makefile gensylv/Makefile bytecode/Makefile - korderpert/Makefile]) + k_order_perturbation/Makefile]) AC_OUTPUT diff --git a/mex/build/octave/korderpert/Makefile.am b/mex/build/octave/k_order_perturbation/Makefile.am similarity index 55% rename from mex/build/octave/korderpert/Makefile.am rename to mex/build/octave/k_order_perturbation/Makefile.am index de771d961..2b3f22e06 100644 --- a/mex/build/octave/korderpert/Makefile.am +++ b/mex/build/octave/k_order_perturbation/Makefile.am @@ -1,4 +1,4 @@ include ../mex.am -include ../../korderpert.am +include ../../k_order_perturbation.am CPPFLAGS += -DMEXEXT=\"mex\" diff --git a/mex/sources/korderpert/Readme.txt b/mex/sources/k_order_perturbation/Readme.txt similarity index 100% rename from mex/sources/korderpert/Readme.txt rename to mex/sources/k_order_perturbation/Readme.txt diff --git a/mex/sources/korderpert/dynamic_dll.cpp b/mex/sources/k_order_perturbation/dynamic_dll.cpp similarity index 100% rename from mex/sources/korderpert/dynamic_dll.cpp rename to mex/sources/k_order_perturbation/dynamic_dll.cpp diff --git a/mex/sources/korderpert/dynamic_dll.h b/mex/sources/k_order_perturbation/dynamic_dll.h similarity index 100% rename from mex/sources/korderpert/dynamic_dll.h rename to mex/sources/k_order_perturbation/dynamic_dll.h diff --git a/mex/sources/korderpert/k_ord_dynare.cpp b/mex/sources/k_order_perturbation/k_ord_dynare.cpp similarity index 100% rename from mex/sources/korderpert/k_ord_dynare.cpp rename to mex/sources/k_order_perturbation/k_ord_dynare.cpp diff --git a/mex/sources/korderpert/k_ord_dynare.h b/mex/sources/k_order_perturbation/k_ord_dynare.h similarity index 100% rename from mex/sources/korderpert/k_ord_dynare.h rename to mex/sources/k_order_perturbation/k_ord_dynare.h diff --git a/mex/sources/korderpert/k_order_perturbation.cpp b/mex/sources/k_order_perturbation/k_order_perturbation.cpp similarity index 100% rename from mex/sources/korderpert/k_order_perturbation.cpp rename to mex/sources/k_order_perturbation/k_order_perturbation.cpp diff --git a/mex/sources/korderpert/tests/first_order.m b/mex/sources/k_order_perturbation/tests/first_order.m similarity index 100% rename from mex/sources/korderpert/tests/first_order.m rename to mex/sources/k_order_perturbation/tests/first_order.m diff --git a/mex/sources/korderpert/tests/fs2000k.mod b/mex/sources/k_order_perturbation/tests/fs2000k.mod similarity index 100% rename from mex/sources/korderpert/tests/fs2000k.mod rename to mex/sources/k_order_perturbation/tests/fs2000k.mod diff --git a/mex/sources/korderpert/tests/k_order_test_main.cpp b/mex/sources/k_order_perturbation/tests/k_order_test_main.cpp similarity index 100% rename from mex/sources/korderpert/tests/k_order_test_main.cpp rename to mex/sources/k_order_perturbation/tests/k_order_test_main.cpp