UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Simplify Shared::CurveViewRange::x|yGridUnit()

Browse Source
This commit is contained in:
Ruben Dashyan
2019-06-10 15:48:57 +02:00
committed by Émilie Feral
parent ffee032e4c
commit 771e0f7c0f
6 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/probability/law/law.cpp
View File

@@ -4,10 +4,6 @@
namespace Probability {
float Law::xGridUnit() {
return computeGridUnit(Axis::X, xMax() - xMin());
}
double Law::cumulativeDistributiveFunctionAtAbscissa(double x) const {
if (!isContinuous()) {
int end = std::round(x);

1
apps/probability/law/law.h
View File

@@ -22,7 +22,6 @@ public:
virtual I18n::Message title() = 0;
virtual Type type() const = 0;
virtual bool isContinuous() const = 0;
float xGridUnit() override;
virtual int numberOfParameter() = 0;
virtual float parameterValueAtIndex(int index) = 0;
virtual I18n::Message parameterNameAtIndex(int index) = 0;

4
apps/shared/curve_view_range.cpp
View File

@@ -15,10 +15,6 @@ uint32_t CurveViewRange::rangeChecksum() {
return Ion::crc32Word((uint32_t *)data, dataLengthInBytes/sizeof(uint32_t));
}
float CurveViewRange::yGridUnit() {
return 0.0f;
}
float CurveViewRange::computeGridUnit(Axis axis, float range) {
int a = 0;
int b = 0;

4
apps/shared/curve_view_range.h
View File

@@ -17,8 +17,8 @@ public:
virtual float xMax() = 0;
virtual float yMin() = 0;
virtual float yMax() = 0;
virtual float xGridUnit() = 0;
virtual float yGridUnit();
virtual float xGridUnit() { return computeGridUnit(Axis::X, xMax() - xMin()); }
virtual float yGridUnit() { return 0.0f; }
float computeGridUnit(Axis axis, float range);
constexpr static float k_maxNumberOfXGridUnits = 18.0f;
constexpr static float k_maxNumberOfYGridUnits = 13.0f;

4
apps/statistics/box_range.cpp
View File

@@ -21,8 +21,4 @@ float BoxRange::xMax() {
return max + k_displayRightMarginRatio*(max - min);
}
float BoxRange::xGridUnit() {
return computeGridUnit(Axis::X, xMax() - xMin());
}
}

1
apps/statistics/box_range.h
View File

@@ -13,7 +13,6 @@ public:
float xMax() override;
float yMin() override { return -k_displayBottomMarginRatio; }
float yMax() override { return 1.0f+k_displayTopMarginRatio; }
float xGridUnit() override;
private:
constexpr static float k_displayTopMarginRatio = 0.05f;
constexpr static float k_displayRightMarginRatio = 0.2f;