|
|
| Line 95: |
Line 95: |
| et.highly_composite = et.highly_composite or rat.is_highly_composite(et.size) | | et.highly_composite = et.highly_composite or rat.is_highly_composite(et.size) |
| return et.highly_composite | | return et.highly_composite |
| end
| |
| function p.is_highly_melodic(et)
| |
| et.highly_composite = et.highly_composite or rat.is_highly_composite(et.size)
| |
| et.superabundant = et.superabundant or rat.is_superabundant(et.size)
| |
| return et.highly_composite or et.superabundant
| |
| end
| |
|
| |
| -- describe why
| |
| function p.why_highly_melodic(et, debug_mode)
| |
| et.highly_composite = et.highly_composite or rat.is_highly_composite(et.size)
| |
| et.superabundant = et.superabundant or rat.is_superabundant(et.size)
| |
| if et.highly_composite and et.superabundant then
| |
| if debug_mode then
| |
| return 'highly composite, superabundant'
| |
| else
| |
| return 'highly composite,<br>superabundant'
| |
| end
| |
| elseif et.highly_composite then
| |
| return 'highly composite'
| |
| elseif et.superabundant then
| |
| return 'superabundant'
| |
| else
| |
| return 'no'
| |
| end
| |
| end | | end |
|
| |
|
| Line 136: |
Line 112: |
| local markers = {} | | local markers = {} |
| if zeta_peak then | | if zeta_peak then |
| if debug_mode then | | table.insert(markers, '[[The Riemann zeta function and tuning#Peak EDOs|zeta peak]]') |
| table.insert(markers, '[[The Riemann zeta function and tuning#Peak EDOs|zeta peak]]')
| |
| else
| |
| table.insert(markers, 'peak')
| |
| end
| |
| elseif zeta_peak == nil then | | elseif zeta_peak == nil then |
| if debug_mode then | | table.insert(markers, '[[The Riemann zeta function and tuning#Peak EDOs|zeta peak?]]') |
| table.insert(markers, '[[The Riemann zeta function and tuning#Peak EDOs|zeta peak?]]')
| |
| else
| |
| table.insert(markers, 'peak?')
| |
| end
| |
| end | | end |
| if integral_zeta then | | if integral_zeta then |
| if debug_mode then | | table.insert(markers, '[[The Riemann zeta function and tuning#Integral of Zeta EDOs|integral of zeta]]') |
| table.insert(markers, '[[The Riemann zeta function and tuning#Integral of Zeta EDOs|integral of zeta]]')
| |
| else
| |
| table.insert(markers, 'integral')
| |
| end
| |
| elseif integral_zeta == nil then | | elseif integral_zeta == nil then |
| if debug_mode then | | table.insert(markers, '[[The Riemann zeta function and tuning#Integral of Zeta EDOs|integral of zeta?]]') |
| table.insert(markers, '[[The Riemann zeta function and tuning#Integral of Zeta EDOs|integral of zeta?]]')
| |
| else
| |
| table.insert(markers, 'integral?')
| |
| end
| |
| end | | end |
| if zeta_gap then | | if zeta_gap then |
| if debug_mode then | | table.insert(markers, '[[The Riemann zeta function and tuning#Zeta Gap EDOs|zeta gap]]') |
| table.insert(markers, '[[The Riemann zeta function and tuning#Zeta Gap EDOs|zeta gap]]')
| |
| else
| |
| table.insert(markers, 'gap')
| |
| end
| |
| elseif zeta_gap == nil then | | elseif zeta_gap == nil then |
| if debug_mode then | | table.insert(markers, '[[The Riemann zeta function and tuning#Zeta Gap EDOs|zeta gap?]]') |
| table.insert(markers, '[[The Riemann zeta function and tuning#Zeta Gap EDOs|zeta gap?]]')
| |
| else
| |
| table.insert(markers, 'gap?')
| |
| end
| |
| end | | end |
| return table.concat(markers, ', ') | | return table.concat(markers, ', ') |