Commit 0cdac2b6 authored by Valérie Maquil's avatar Valérie Maquil
Browse files

adapted equations

parent 65d3724c
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
<stepSize>10</stepSize> <stepSize>10</stepSize>
<variable> <variable>
<name>Inclination</name> <name>Inclination</name>
<unit>%</unit> <unit>°</unit>
<value>-10</value> <value>-10</value>
</variable> </variable>
<modifyValueOnRotation>True</modifyValueOnRotation> <modifyValueOnRotation>True</modifyValueOnRotation>
...@@ -581,7 +581,7 @@ ...@@ -581,7 +581,7 @@
<object> <object>
<name>Ground</name> <name>Ground</name>
<lowerBound>0.2</lowerBound> <lowerBound>0.2</lowerBound>
<upperBound>0.4</upperBound> <upperBound>0.3</upperBound>
<lowerStopAngle>1.57</lowerStopAngle> <lowerStopAngle>1.57</lowerStopAngle>
<upperStopAngle>4.71</upperStopAngle> <upperStopAngle>4.71</upperStopAngle>
<stepSize>0.2</stepSize> <stepSize>0.2</stepSize>
...@@ -733,7 +733,22 @@ ...@@ -733,7 +733,22 @@
<shape>Circle</shape> <shape>Circle</shape>
<drawPriority>0</drawPriority> <drawPriority>0</drawPriority>
</corona> </corona>
<corona>
<type>TextBox</type>
<handle>7</handle>
<drawPriority>1</drawPriority>
<lineWidth>100</lineWidth>
<font>Arial-20</font>
<initialTranslation>
<x>0</x>
<y>30</y>
<z>0</z>
<state>ScreenCoordinates</state>
</initialTranslation>
<rotateWithHandle>false</rotateWithHandle>
<centred>true</centred>
<text></text>
</corona>
<corona> <corona>
<type>ConditionalCorona</type> <type>ConditionalCorona</type>
<triggers> <triggers>
...@@ -882,7 +897,22 @@ ...@@ -882,7 +897,22 @@
<shape>Circle</shape> <shape>Circle</shape>
<drawPriority>0</drawPriority> <drawPriority>0</drawPriority>
</corona> </corona>
<corona>
<type>TextBox</type>
<handle>8</handle>
<drawPriority>1</drawPriority>
<lineWidth>100</lineWidth>
<font>Arial-20</font>
<initialTranslation>
<x>0</x>
<y>30</y>
<z>0</z>
<state>ScreenCoordinates</state>
</initialTranslation>
<rotateWithHandle>false</rotateWithHandle>
<centred>true</centred>
<text></text>
</corona>
<corona> <corona>
<type>ConditionalCorona</type> <type>ConditionalCorona</type>
<handle>8</handle> <handle>8</handle>
...@@ -1037,7 +1067,7 @@ ...@@ -1037,7 +1067,7 @@
<unit>N</unit> <unit>N</unit>
</parameter> </parameter>
</parameters> </parameters>
<invoke>-(WheelGear) / PedalGear ;</invoke> <invoke>(5-((-(WheelGear)-1)*0.35)) / (5+((PedalGear-1)*2.5)) ;</invoke>
<results> <results>
<result> <result>
<name>Ratio</name> <name>Ratio</name>
...@@ -1052,7 +1082,7 @@ ...@@ -1052,7 +1082,7 @@
<parameters> <parameters>
<parameter> <parameter>
<name>Inclination</name> <name>Inclination</name>
<unit>%</unit> <unit>°</unit>
</parameter> </parameter>
<parameter> <parameter>
<name>Ground</name> <name>Ground</name>
...@@ -1068,7 +1098,7 @@ ...@@ -1068,7 +1098,7 @@
<unit>Gear</unit> <unit>Gear</unit>
</parameter> </parameter>
</parameters> </parameters>
<invoke>Math.floor((74 * 10 * (Ground + Math.sin(Inclination/180 * 6.28))) * ( (37*(5+((PedalGear-1)*2.5))) / ((5-((-(WheelGear)-1)*0.35))*20)));</invoke> <invoke>Math.floor((74 * 10 * (Ground + Math.sin(Inclination/180 * 3.14))) * ( (37*(5+((PedalGear-1)*2.5))) / ((5-((-(WheelGear)-1)*0.35))*17)));</invoke>
<results> <results>
<result> <result>
<name>ForceOnPedal</name> <name>ForceOnPedal</name>
...@@ -1082,7 +1112,7 @@ ...@@ -1082,7 +1112,7 @@
<parameters> <parameters>
<parameter> <parameter>
<name>Inclination</name> <name>Inclination</name>
<unit>%</unit> <unit>°</unit>
</parameter> </parameter>
<parameter> <parameter>
<name>Ground</name> <name>Ground</name>
...@@ -1093,7 +1123,7 @@ ...@@ -1093,7 +1123,7 @@
<unit>km</unit> <unit>km</unit>
</parameter> </parameter>
</parameters> </parameters>
<invoke>Math.floor((74 * 10 * (Ground + Math.sin(Inclination/180 * 6.28))) * Distance)</invoke> <invoke>Math.floor((74 * 10 * (Ground + Math.sin(Inclination/180 * 3.14))) * Distance)</invoke>
<results> <results>
<result> <result>
<name>Energy</name> <name>Energy</name>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment