Add separate spoolup calculator
This commit is contained in:
0
eos/utils/__init__.py
Normal file
0
eos/utils/__init__.py
Normal file
26
eos/utils/float.py
Normal file
26
eos/utils/float.py
Normal file
@@ -0,0 +1,26 @@
|
||||
"""
|
||||
Sometimes use of floats may lead to undesirable results, e.g.
|
||||
int(2.3 / 0.1) = 22.
|
||||
We cannot afford to use different number representations (e.g. representations
|
||||
provided by decimal or fraction modules), thus consequences are worked around by
|
||||
this module.
|
||||
"""
|
||||
|
||||
import math
|
||||
import sys
|
||||
|
||||
|
||||
# As we will be rounding numbers after operations (which introduce higher error
|
||||
# than base float representation error), we need to keep less significant
|
||||
# numbers than for single float number w/o operations
|
||||
keepDigits = int(sys.float_info.dig / 2)
|
||||
|
||||
|
||||
def floatUnerr(value):
|
||||
"""Round possible float number error, killing some precision in process."""
|
||||
if value == 0:
|
||||
return value
|
||||
# Find round factor, taking into consideration that we want to keep at least
|
||||
# predefined amount of significant digits
|
||||
roundFactor = int(keepDigits - math.ceil(math.log10(abs(value))))
|
||||
return round(value, roundFactor)
|
||||
43
eos/utils/spoolSupport.py
Normal file
43
eos/utils/spoolSupport.py
Normal file
@@ -0,0 +1,43 @@
|
||||
# ===============================================================================
|
||||
# Copyright (C) 2010 Diego Duclos
|
||||
#
|
||||
# This file is part of eos.
|
||||
#
|
||||
# eos is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# eos is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# along with eos. If not, see <http://www.gnu.org/licenses/>.
|
||||
# ===============================================================================
|
||||
|
||||
|
||||
from enum import IntEnum, unique
|
||||
|
||||
from eos.utils.float import floatUnerr
|
||||
|
||||
|
||||
@unique
|
||||
class SpoolType(IntEnum):
|
||||
SCALE = 0 # [0..1]
|
||||
TIME = 1 # Expressed via time in seconds since spoolup started
|
||||
CYCLES = 2 # Expressed in amount of cycles since spoolup started
|
||||
|
||||
|
||||
def calculateSpoolup(modMaxValue, modStepValue, modCycleTime, spoolType, spoolAmount):
|
||||
if spoolType == SpoolType.SCALE:
|
||||
return (floatUnerr(spoolAmount * modMaxValue) // modStepValue) * modStepValue
|
||||
elif spoolType == SpoolType.TIME:
|
||||
# Stub
|
||||
return 0
|
||||
elif spoolType == SpoolType.CYCLES:
|
||||
cycles = round(spoolAmount)
|
||||
return min(modMaxValue, cycles * modStepValue)
|
||||
else:
|
||||
return 0
|
||||
Reference in New Issue
Block a user