doc: note
4 lines of code changed in 1 file:
bibtex file as var
2 lines of code changed in 1 file:
note on asciidoc-bib as dependency
2 lines of code changed in 1 file:
explicit csl
1 lines of code changed in 1 file:
bibliography database moved to dox, now require explicit reference in Makefile
26 lines of code changed in 3 files:
description
0 lines of code changed in 1 file:
added asciidoc-bib gem install file v2.4.3
0 lines of code changed in 1 file:
auto-generate bibliography using `asciidoc-bib`
52 lines of code changed in 3 files:
avoid accumulation of older plots as dislin tries to not overwrite outputs
2 lines of code changed in 1 file:
doc: formula
1 lines of code changed in 1 file:
doc: column specifiers not (well?) supported on asciidoctor, bc calc code superfluous
10 lines of code changed in 1 file:
doc: cross-ref
3 lines of code changed in 2 files:
doc: typo
1 lines of code changed in 1 file:
added example for decay equation
39 lines of code changed in 2 files:
experiment with relative dx/dt
1 lines of code changed in 1 file:
more tests with decay params
4 lines of code changed in 1 file:
note, higher precision
1 lines of code changed in 1 file:
notes on exponential decay, with interpolation equivalent
13 lines of code changed in 2 files:
doc: typo
4 lines of code changed in 1 file:
doc: formats
22 lines of code changed in 1 file:
micro note
1 lines of code changed in 1 file:
doc: small changes
2 lines of code changed in 2 files:
doc: small chanhes
2 lines of code changed in 1 file:
small changes
5 lines of code changed in 1 file:
numbered list of parameters and symbols
12 lines of code changed in 1 file:
doc: some TODO substituted by 'Lorem ipsum'
59 lines of code changed in 1 file:
delimiters only changed
10 lines of code changed in 1 file:
move figure caption
1 lines of code changed in 1 file:
converted **table** of symbols to list delimited as **sidebar**, `latexmath` seems broken in **asciidoctor**, even though works in **asciidoc**
34 lines of code changed in 1 file:
using passthrough delimited block style for latex formulas in asciidoc, because asciidoctor-mathematical does not understand one-line block macro style (e.g. `latexmath::[]`)
8 lines of code changed in 1 file:
comment only
4 lines of code changed in 1 file:
note only
1 lines of code changed in 1 file:
added simple code, not adapted for very big arrays
5 lines of code changed in 1 file:
added random data in ntest prog
6 lines of code changed in 1 file:
header comments
9 lines of code changed in 1 file:
comments and small changes, e.g. Oracle f95 doesn't support implicit array size in definition
12 lines of code changed in 2 files:
module for simple stats, mean and std.dev, based on commondata
291 lines of code changed in 2 files:
doc: small update
2 lines of code changed in 1 file:
doc: small update
1 lines of code changed in 1 file:
doc: update and fix on stomach
30 lines of code changed in 2 files:
doc: fix typo
3 lines of code changed in 1 file:
doc: done model description for stomach
53 lines of code changed in 2 files:
just a note added
2 lines of code changed in 1 file:
update scheme
0 lines of code changed in 1 file:
only added notes
8 lines of code changed in 2 files:
manually written DOT schemes now auto-convert to svg for manual
13 lines of code changed in 5 files:
handwritten ODG graphics auto-converted to svg for manual
19 lines of code changed in 5 files:
draft overall scheme of the model
438 lines of code changed in 3 files:
dislin tries to avoid rewriting ouput files by default creating manu numbered copies, so need cleaning plots
3 lines of code changed in 1 file:
doc: added some info and tags
56 lines of code changed in 1 file:
`Verbose` is easier to read than `Is_V`
49 lines of code changed in 3 files:
describe quiet mode
3 lines of code changed in 1 file:
use quiet mode to produce plots
2 lines of code changed in 1 file:
use `system` as `execute_command_line` may crash on non-existent command
7 lines of code changed in 1 file:
implemented OS shell command
9 lines of code changed in 1 file:
write all kind of accessory information only in the "verbose mode" when `Is_V` is TRUE
66 lines of code changed in 1 file:
avoid printing empty line, need only error
1 lines of code changed in 1 file:
parameter changed to `Is_V`for "verbose mode", it makes it easier to place it to `write` instruction, e.g. `if (Is_V) write(*,*) ...`
5 lines of code changed in 2 files:
added global parameter `Is_Q` for "quiet mode", suppressing extra outputsm this is helpful for the command line mode
15 lines of code changed in 2 files:
`plots` is a dependency
1 lines of code changed in 1 file:
reduce `INCR` for smoother plot
2 lines of code changed in 2 files:
plots now needed before manual can be built
1 lines of code changed in 1 file:
delete autogenerated plots on `distclean`
1 lines of code changed in 1 file:
bigger plots, standard width; note that plots now autogenerated with `make plots` command before `make manual`
2 lines of code changed in 1 file:
plots for docs now autogenerated
0 lines of code changed in 3 files:
better name
2 lines of code changed in 1 file:
plot making target for all platforms
7 lines of code changed in 1 file:
autoplot script
13 lines of code changed in 1 file:
renamed to simgut (delete 'f')
16 lines of code changed in 4 files:
cleanup parameters config file
7 lines of code changed in 1 file:
default time scale unit changed to hours
1 lines of code changed in 1 file:
report time unin in graphics in CMD mode
12 lines of code changed in 1 file:
total midgut absorption now plotting x scale adjusts for sec, min, hours
35 lines of code changed in 2 files:
total volume of food in midgut, now plotting x scale adjusts for sec, min, hours
36 lines of code changed in 2 files:
total volume of food in stomach, now plotting x scale adjusts for sec, min, hours
31 lines of code changed in 2 files:
appetite, now plotting x scale adjusts for sec, min, hours
35 lines of code changed in 2 files:
cumulative n food items provided/encountered, plotting x scale adjusts for sec, min, hours
35 lines of code changed in 2 files:
cumulative n food items not ingested, now plotting x scale adjusts for sec, min, hours
35 lines of code changed in 2 files:
debug error reporting in `select case`
8 lines of code changed in 2 files:
plotting total n ingested, now adjustable X scale to sec, min, hours
31 lines of code changed in 2 files:
reformat only
8 lines of code changed in 1 file:
use sec, min and hour scales in (plot_stomach_transport) in CMD
21 lines of code changed in 1 file:
use sec, min and hour scales in (do_plot_stomach_transport) in GUI
18 lines of code changed in 1 file:
delete debug code
0 lines of code changed in 1 file:
added parameter `Global_Time_Plots_Unit_Scale` for time scale unit in plots
30 lines of code changed in 3 files:
notify on DEBUG mode (`IS_DEBUG`)
1 lines of code changed in 1 file:
doc: added appetite function example plot
0 lines of code changed in 1 file:
doc: renew plot for manual
559 lines of code changed in 1 file:
added axes desctiption for midgut Michaelis-Menten parameter plot
4 lines of code changed in 2 files:
added axis for appetite parameter function
4 lines of code changed in 2 files:
doc: added module deps to manual
10 lines of code changed in 1 file:
module dependencies graph using dot
* use `dot -Tsvg modules_dep.dot > modules_dep.svg` to (re)generate svg
* TODO: make autogeneration option in makefile
227 lines of code changed in 2 files:
added R version proper full code
2723 lines of code changed in 46 files:
reorganise R
332 lines of code changed in 16 files:
added scilab version full proper code
4835 lines of code changed in 55 files:
reorganise
359 lines of code changed in 16 files:
reorganise
351 lines of code changed in 16 files:
original name
0 lines of code changed in 8 files:
added main matlab code
4833 lines of code changed in 70 files:
fix links to main page
4 lines of code changed in 1 file:
added ref to main page in intro
28 lines of code changed in 1 file:
intro page with links to mdptoolbox proper
116 lines of code changed in 1 file:
python version of mdptoolbox from https://github.com/sawcordwell/pymdptoolbox
5965 lines of code changed in 40 files:
added MDPtoolbox doi: 10.1111/ecog.00888
4460 lines of code changed in 33 files:
add project logo
0 lines of code changed in 1 file:
add mifgut mm plot
3 lines of code changed in 1 file:
better name, set midgut/stomach mandatory in name
201 lines of code changed in 2 files:
add michaelis-meneten midgut absorption plot
0 lines of code changed in 1 file:
better reference to source revision number
1 lines of code changed in 1 file:
comment added
4 lines of code changed in 1 file:
added model version macro and include file for asciidoc manual (include)
14 lines of code changed in 2 files:
no need to double asterisks for bold in asciidoc
4 lines of code changed in 1 file:
model description separate section
13 lines of code changed in 1 file:
delete obsolete comment
0 lines of code changed in 1 file:
added parameters file as appendix, example
10 lines of code changed in 1 file:
better plot with splines enabled
produced with `INCR=1000` and this diff:
{{{
Index: m_ifgui.f90
===================================================================
--- m_ifgui.f90 (revision 9562)
+++ m_ifgui.f90 (working copy)
@@ -529,7 +529,7 @@
call name ('Time, s', 'X')
call name ('Volume', 'Y')
- !call polcrv('SPLINE')
+ call polcrv('SPLINE')
call qplot ( real(plot_t,SRP), st_food_item_volume(plot_t), size(plot_t) )
call disfin()
}}}
191 lines of code changed in 1 file:
fix stomach pattern plot in manual after fix r9561
173 lines of code changed in 1 file:
zero initial value makes wrong plot for stomach pattern
1 lines of code changed in 1 file:
added some description text with latex formulas and program-generated output plot
791 lines of code changed in 2 files:
added graphics from `dox`
7 lines of code changed in 1 file:
typo fix
1 lines of code changed in 1 file:
started writing filling in manual, use `latexmath` macros for **pdf**, need to add and test `asciimath` macros for html output
88 lines of code changed in 1 file:
small fixes to doxy config, added readme to doc
5 lines of code changed in 1 file:
test user-defined keyword
1 lines of code changed in 1 file:
gamma2gene: merged tested r9487: merged changes in (allelescale) and (gamma2gene) backends from SIGMOID_tweak_new r9486
- see patch r9551
41 lines of code changed in 1 file:
white space only: fix if block indent for readability
0 lines of code changed in 18 files:
white space only: fix if block indent for readability
30 lines of code changed in 30 files:
gamma2gene: merged tested r9487: merged changes in (allelescale) and (gamma2gene) backends from SIGMOID_tweak_new r9486
*Patch code:*
{{{
Index: m_common.f90
===================================================================
--- m_common.f90 (.../HEDG2_06.b2/HEDG2_06.P1H) (revision 9189)
+++ m_common.f90 (.../HEDG2_06.b3/HEDG2_06.P1H) (revision 9550)
@@ -2594,6 +2594,11 @@
!! `commondata::allelescale()` functions.
integer, parameter, public :: ALLELERANGE_MAX = 10000
+ !> Conversion parameter that defines the scaling of the integer allele
+ !! values ::ALLELERANGE_MIN to ALLELERANGE_MAX are converted to ::zero to
+ !! this parameter value as the maximum. See ::allelescale() for details.
+ real(SRP), parameter, public :: ALLELESCALE_MAX = 20.0_SRP
+
!> Number of additive allele components
integer, parameter, public :: ADDITIVE_COMPS = 3
@@ -6875,14 +6880,15 @@
!! @param[in] raw_value raw input value, integer within
!! `commondata::allelerange_min` and `commondata::allelerange_max`
!! @retval Returns the value of conversion function: integer alleles
- !! to real internal value 0 to 1
+ !! to real internal value ::zero to ::allelescale_max
!! @details Allele conversion function for the relationship between the
!! genome integer allele value and its converted real value in
!! the neuronal response function. The function rescales integer
!! allele value @f$ I_{i} @f$ within the range
!! @f$ [I_{min},I_{max}] @f$ to real values @f$ r @f$ within the
- !! range @f$ [0,1] @f$ using the formula:
- !! @f[ r = \frac{I - I_{min}}{I_{max}-I_{min}} @f]
+ !! range @f$ [0,M] @f$, where @f$ M @f$ is defined by the
+ !! ::allelescale_max parameter. Conversion is performed by the
+ !! ::rescale() backend function.
!! See implementation notes on `allele_value` component of the
!! `GENE` derived type.
!! @note Note that it is an *elemental function* that can accept both
@@ -6889,20 +6895,13 @@
!! scalar and vector arguments.
elemental function allelescale(raw_value) result(converted)
- ! @param[in] raw_value raw input value, integer within
- ! `commondata::allelerange_min` and `commondata::allelerange_max`.
integer, intent(in) :: raw_value
- ! @retval Returns the value of conversion function: integer alleles
- ! to real internal value 0 to 1
real(SRP) :: converted
- converted = (real(raw_value,SRP) - ALLELERANGE_MIN) / &
- (ALLELERANGE_MAX - ALLELERANGE_MIN)
+ converted = rescale( real(raw_value,SRP), &
+ real(ALLELERANGE_MIN,SRP), real(ALLELERANGE_MAX,SRP),&
+ ZERO, ALLELESCALE_MAX )
- !> @warning We must never accept zero values of alleles as they will
- !! result in **division by zero** in `commondata::gamma2gene()`.
- if (converted < ZERO) converted = ZERO
-
end function allelescale
!-----------------------------------------------------------------------------
@@ -7025,13 +7024,13 @@
! function.
! @note Note that the raw integer gene values are accepted by this
! function as `allelescale` is called automatically inside.
- integer, dimension(ADDITIVE_COMPS), intent(in) :: gs
+ integer, dimension(:), intent(in) :: gs
! @param[in] gh half-max effect: Gene/constant for the signal strength
! giving half max effect.
! @note Note that the raw integer gene values are accepted by this
! function as allelescale is called automatically inside.
- integer, dimension(ADDITIVE_COMPS), intent(in) :: gh
+ integer, dimension(:), intent(in) :: gh
! @param[in] signal perception: Input value of (external or internal)
! stimulus perception.
@@ -7045,7 +7044,7 @@
! Local variables:
real(SRP) :: perception
- real(SRP) :: d1
+ real(HRP) :: d1, nr
integer :: i
! Parameter that specifies the minimum perception. Can be commondata::zero
@@ -7065,7 +7064,7 @@
if (present(erpcv)) then
if (erpcv > TOLERANCE_HIGH_DEF_SRP) then
perception = max(FORCED_MIN_PERCEPT, RNORM(signal,(erpcv*signal)**2))
- else
+ else
perception = max(FORCED_MIN_PERCEPT, signal)
end if
else
@@ -7072,16 +7071,22 @@
perception = max(FORCED_MIN_PERCEPT, signal)
end if
- neuronal_response = 0.0_SRP
+ nr = 0.0_HRP
! @warning The `do concurrent` construct is F2008 and can not (yet) be
! implemented in all compilers. Use normal `do` in such a case.
- do concurrent (i=1:ADDITIVE_COMPS)
- d1 = ( perception / alleleconv( allelescale(gh(i)) ) &
- ) ** alleleconv( allelescale(gs(i)) )
- neuronal_response = neuronal_response + d1/(1.0_SRP+d1)
+ do concurrent (i=1:size(gs))
+ d1 = (real(perception, HRP) / real(alleleconv(allelescale(gh(i))),HRP)) &
+ ** real( alleleconv( allelescale(gs(i)) ), HRP )
+ nr = nr + d1/(1.0_HRP+d1)
end do
+ if (nr < ZERO) then
+ neuronal_response = ZERO
+ else
+ neuronal_response = real(nr, SRP)
+ end if
+
end function gamma2gene_additive_i4
!-----------------------------------------------------------------------------
@@ -7130,13 +7135,13 @@
! function.
! @note Note that the raw integer gene values are accepted by this
! function as `allelescale` is called automatically inside.
- real(SRP), dimension(ADDITIVE_COMPS), intent(in) :: gs
+ real(SRP), dimension(:), intent(in) :: gs
! @param[in] half-max effect: Gene/constant for the signal strength giving
! half max effect.
! @note Note that the raw integer gene values are accepted by this
! function as `allelescale` is called automatically inside.
- real(SRP), dimension(ADDITIVE_COMPS), intent(in) :: gh
+ real(SRP), dimension(:), intent(in) :: gh
! @param[in] perception: Input value of (external or internal) stimulus
! perception.
@@ -7150,7 +7155,7 @@
! Local variables:
real(SRP) :: perception
- real(SRP) :: d1
+ real(HRP) :: d1, nr
integer :: i
! Parameter that specifies the minimum perception. Can be commondata::zero
@@ -7169,7 +7174,7 @@
if (present(erpcv)) then
if (erpcv > TOLERANCE_HIGH_DEF_SRP) then
perception = max(FORCED_MIN_PERCEPT, RNORM(signal,(erpcv*signal)**2))
- else
+ else
perception = max(FORCED_MIN_PERCEPT, signal)
end if
else
@@ -7176,16 +7181,22 @@
perception = max(FORCED_MIN_PERCEPT, signal)
end if
- neuronal_response = 0.0_SRP
+ nr = 0.0_HRP
! @warning The `do concurrent` construct is F2008 and can not (yet) be
! implemented in all compilers. Use normal `do` in such a case.
- do concurrent (i=1:ADDITIVE_COMPS)
- d1 = (perception / alleleconv(gh(i)) &
- ) ** alleleconv(gs(i))
- neuronal_response = neuronal_response + d1/(1.0_SRP+d1)
+ do concurrent (i=1:size(gs))
+ d1 = (real(perception,HRP) / real(alleleconv(gh(i)),HRP)) &
+ ** real( alleleconv(gs(i)),HRP )
+ nr = nr + d1/(1.0_HRP+d1)
end do
+ if (nr < ZERO) then
+ neuronal_response = ZERO
+ else
+ neuronal_response = real(nr, SRP)
+ end if
+
end function gamma2gene_additive_r4
!-----------------------------------------------------------------------------
}}}
918 lines of code changed in 22 files:
update local repository before backup
10 lines of code changed in 1 file:
May 2020 »