vbk_studentt working for eval and evan_m2lnp. Copy of APS to work wit…

…h vbk (not included in makefile). Copy of gauss to gauss vbk(included in makefile)
NumCosmo · Jun 14, 2021 · 16c7f54 · 16c7f54
1 parent 278c951
commit 16c7f54
Show file tree

Hide file tree

Showing 19 changed files with 1,230 additions and 2,774 deletions.
diff --git a/aminclude_static.am b/aminclude_static.am
@@ -1,6 +1,6 @@
 
 # aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Fri May 21 15:01:27 -03 2021
+# from AX_AM_MACROS_STATIC on Mon Jun 14 15:06:41 -03 2021
 
 
 # Code coverage
@@ -60,7 +60,7 @@ CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=$(if $(CODE_COVERAGE_BRANCH_COVERAGE),--
 CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
 CODE_COVERAGE_IGNORE_PATTERN ?=
 
-GITIGNOREFILES := $(GITIGNOREFILES) $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+GITIGNOREFILES = $(GITIGNOREFILES) $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
 code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
 code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
 code_coverage_v_lcov_cap_0 = @echo "  LCOV   --capture" $(CODE_COVERAGE_OUTPUT_FILE);
@@ -97,7 +97,7 @@ code-coverage-clean:
 
 code-coverage-dist-clean:
 
-AM_DISTCHECK_CONFIGURE_FLAGS := $(AM_DISTCHECK_CONFIGURE_FLAGS) --disable-code-coverage
+AM_DISTCHECK_CONFIGURE_FLAGS = $(AM_DISTCHECK_CONFIGURE_FLAGS) --disable-code-coverage
  else # ifneq ($(abs_builddir), $(abs_top_builddir))
 check-code-coverage:
 

diff --git a/examples/example_rosenbrock.py b/examples/example_rosenbrock.py
@@ -94,12 +94,12 @@
 # 
 sampler = 'aps'
 #sampler  = 'stretch'
-nwalkers = int (math.ceil (300 * 2))
-ssize    = 15000000
+nwalkers = int (math.ceil (80 *2 * 2))
+ssize    = 8000000
 
 if sampler == 'aps':
   walker = Ncm.FitESMCMCWalkerAPS.new (nwalkers, mset.fparams_len ())
-  walker.set_rand_walk_prob (0.0)
+ # walker.set_rand_walk_prob (0.0)
 elif sampler == "stretch":
   walker = Ncm.FitESMCMCWalkerStretch.new (nwalkers, mset.fparams_len ())
 

diff --git a/examples/example_rosenbrock_aps_st_320.mset b/examples/example_rosenbrock_aps_st_320.mset
@@ -0,0 +1,50 @@
+################################################################################
+#
+#  NcmMSet
+#
+#
+[NcmMSet]
+################################################################################
+#
+#  valid-map property
+#
+#
+valid_map=true
+
+################################################################################
+#
+#  MRB
+#
+#
+[NcmModelRosenbrock]
+NcmModelRosenbrock=NcmModelRosenbrock
+################################################################################
+#
+#  NcmModel array of NcmSParam
+#
+#
+sparam-array={'NcmSParam': {'name': <'x1'>, 'symbol': <'x_1'>, 'lower-bound': <-200.0>, 'upper-bound': <200.0>, 'scale': <0.10000000000000001>, 'absolute-tolerance': <0.0>, 'default-value': <0.0>, 'fit-type': <0>}, 'NcmSParam': {'name': <'x2'>, 'symbol': <'x_2'>, 'lower-bound': <-400.0>, 'upper-bound': <800.0>, 'scale': <0.10000000000000001>, 'absolute-tolerance': <0.0>, 'default-value': <0.0>, 'fit-type': <0>}}
+################################################################################
+#
+#  x_1
+#
+#
+x1=0.0
+################################################################################
+#
+#  x_2
+#
+#
+x2=0.0
+################################################################################
+#
+#  x_1:fit
+#
+#
+x1-fit=true
+################################################################################
+#
+#  x_2:fit
+#
+#
+x2-fit=true
diff --git a/gtk-doc.make b/gtk-doc.make
@@ -57,7 +57,6 @@ DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).actions	 \
 	$(DOC_MODULE).args 	 \
 	$(DOC_MODULE).hierarchy  \
 	$(DOC_MODULE).interfaces \