Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Iot
提交
823a85db
I
Iot
项目概览
jobily
/
Iot
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
823a85db
编写于
9月 24, 2020
作者:
P
Patrick Grawehr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change a few missed "double" types for altitude to "Length".
上级
0bda59db
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
18 addition
and
17 deletion
+18
-17
src/devices/Common/Iot/Device/Common/WeatherHelper.cs
src/devices/Common/Iot/Device/Common/WeatherHelper.cs
+12
-11
src/devices/Common/tests/WeatherTests.cs
src/devices/Common/tests/WeatherTests.cs
+6
-6
未找到文件。
src/devices/Common/Iot/Device/Common/WeatherHelper.cs
浏览文件 @
823a85db
...
...
@@ -181,9 +181,10 @@ namespace Iot.Device.Common
/// <param name="seaLevelPressure">The sea-level pressure</param>
/// <param name="airTemperature">The dry air temperature at the point for which altitude is being calculated</param>
/// <returns>The altitude in meters</returns>
public
static
double
CalculateAltitude
(
Pressure
pressure
,
Pressure
seaLevelPressure
,
Temperature
airTemperature
)
public
static
Length
CalculateAltitude
(
Pressure
pressure
,
Pressure
seaLevelPressure
,
Temperature
airTemperature
)
{
return
((
Math
.
Pow
(
seaLevelPressure
.
Pascals
/
pressure
.
Pascals
,
1
/
5.255
)
-
1
)
*
airTemperature
.
Kelvins
)
/
0.0065
;
double
meters
=
((
Math
.
Pow
(
seaLevelPressure
.
Pascals
/
pressure
.
Pascals
,
1
/
5.255
)
-
1
)
*
airTemperature
.
Kelvins
)
/
0.0065
;
return
Length
.
FromMeters
(
meters
);
}
/// <summary>
...
...
@@ -192,7 +193,7 @@ namespace Iot.Device.Common
/// <param name="pressure">The pressure at the point for which altitude is being calculated</param>
/// <param name="airTemperature">The dry air temperature at the point for which altitude is being calculated</param>
/// <returns>The altitude in meters</returns>
public
static
double
CalculateAltitude
(
Pressure
pressure
,
Temperature
airTemperature
)
public
static
Length
CalculateAltitude
(
Pressure
pressure
,
Temperature
airTemperature
)
{
return
CalculateAltitude
(
pressure
,
MeanSeaLevel
,
airTemperature
);
}
...
...
@@ -203,7 +204,7 @@ namespace Iot.Device.Common
/// <param name="pressure">The pressure at the point for which altitude is being calculated</param>
/// <param name="seaLevelPressure">The sea-level pressure</param>
/// <returns>The altitude in meters</returns>
public
static
double
CalculateAltitude
(
Pressure
pressure
,
Pressure
seaLevelPressure
)
public
static
Length
CalculateAltitude
(
Pressure
pressure
,
Pressure
seaLevelPressure
)
{
return
CalculateAltitude
(
pressure
,
seaLevelPressure
,
Temperature
.
FromDegreesCelsius
(
15
));
}
...
...
@@ -213,7 +214,7 @@ namespace Iot.Device.Common
/// </summary>
/// <param name="pressure">The pressure at the point for which altitude is being calculated</param>
/// <returns>The altitude in meters</returns>
public
static
double
CalculateAltitude
(
Pressure
pressure
)
public
static
Length
CalculateAltitude
(
Pressure
pressure
)
{
return
CalculateAltitude
(
pressure
,
MeanSeaLevel
,
Temperature
.
FromDegreesCelsius
(
15
));
}
...
...
@@ -226,9 +227,9 @@ namespace Iot.Device.Common
/// <param name="airTemperature">The air temperature</param>
/// <returns>The estimated absolute sea-level pressure</returns>
/// <remarks><see cref="CalculatePressure"/> solved for sea level pressure</remarks>
public
static
Pressure
CalculateSeaLevelPressure
(
Pressure
pressure
,
double
altitude
,
Temperature
airTemperature
)
public
static
Pressure
CalculateSeaLevelPressure
(
Pressure
pressure
,
Length
altitude
,
Temperature
airTemperature
)
{
return
Pressure
.
FromPascals
(
Math
.
Pow
((((
0.0065
*
altitude
)
/
airTemperature
.
Kelvins
)
+
1
),
5.255
)
*
pressure
.
Pascals
);
return
Pressure
.
FromPascals
(
Math
.
Pow
((((
0.0065
*
altitude
.
Meters
)
/
airTemperature
.
Kelvins
)
+
1
),
5.255
)
*
pressure
.
Pascals
);
}
/// <summary>
...
...
@@ -238,9 +239,9 @@ namespace Iot.Device.Common
/// <param name="altitude">The altitude in meters at the point for which pressure is being calculated</param>
/// <param name="airTemperature">The air temperature at the point for which pressure is being calculated</param>
/// <returns>The estimated absolute pressure at the given altitude</returns>
public
static
Pressure
CalculatePressure
(
Pressure
seaLevelPressure
,
double
altitude
,
Temperature
airTemperature
)
public
static
Pressure
CalculatePressure
(
Pressure
seaLevelPressure
,
Length
altitude
,
Temperature
airTemperature
)
{
return
Pressure
.
FromPascals
(
seaLevelPressure
.
Pascals
/
Math
.
Pow
((((
0.0065
*
altitude
)
/
airTemperature
.
Kelvins
)
+
1
),
5.255
));
return
Pressure
.
FromPascals
(
seaLevelPressure
.
Pascals
/
Math
.
Pow
((((
0.0065
*
altitude
.
Meters
)
/
airTemperature
.
Kelvins
)
+
1
),
5.255
));
}
/// <summary>
...
...
@@ -251,9 +252,9 @@ namespace Iot.Device.Common
/// <param name="altitude">The altitude in meters at the point for which temperature is being calculated</param>
/// <returns>The standard temperature at the given altitude, when the given pressure difference is known</returns>
/// <remarks><see cref="CalculatePressure"/> solved for temperature</remarks>
public
static
Temperature
CalculateTemperature
(
Pressure
pressure
,
Pressure
seaLevelPressure
,
double
altitude
)
public
static
Temperature
CalculateTemperature
(
Pressure
pressure
,
Pressure
seaLevelPressure
,
Length
altitude
)
{
return
Temperature
.
FromKelvins
((
0.0065
*
altitude
)
/
(
Math
.
Pow
(
seaLevelPressure
.
Pascals
/
pressure
.
Pascals
,
1
/
5.255
)
-
1
));
return
Temperature
.
FromKelvins
((
0.0065
*
altitude
.
Meters
)
/
(
Math
.
Pow
(
seaLevelPressure
.
Pascals
/
pressure
.
Pascals
,
1
/
5.255
)
-
1
));
}
/// <summary>
...
...
src/devices/Common/tests/WeatherTests.cs
浏览文件 @
823a85db
...
...
@@ -88,7 +88,7 @@ namespace Iot.Device.Common.Tests
public
void
AltitudeIsCalculatedCorrectlyAtMslpAndDefaultTemp
(
double
expected
,
double
hpa
)
{
var
altitude
=
WeatherHelper
.
CalculateAltitude
(
Pressure
.
FromHectopascals
(
hpa
));
Assert
.
Equal
(
expected
,
Math
.
Round
(
altitude
,
2
));
Assert
.
Equal
(
expected
,
Math
.
Round
(
altitude
.
Meters
,
2
));
}
[
Theory
]
...
...
@@ -98,7 +98,7 @@ namespace Iot.Device.Common.Tests
public
void
AltitudeIsCalculatedCorrectlyAtDefaultTemp
(
double
expected
,
double
hpa
,
double
seaLevelHpa
)
{
var
altitude
=
WeatherHelper
.
CalculateAltitude
(
Pressure
.
FromHectopascals
(
hpa
),
Pressure
.
FromHectopascals
(
seaLevelHpa
));
Assert
.
Equal
(
expected
,
Math
.
Round
(
altitude
,
2
));
Assert
.
Equal
(
expected
,
Math
.
Round
(
altitude
.
Meters
,
2
));
}
[
Theory
]
...
...
@@ -108,7 +108,7 @@ namespace Iot.Device.Common.Tests
public
void
AltitudeIsCalculatedCorrectly
(
double
expected
,
double
hpa
,
double
seaLevelHpa
,
double
celsius
)
{
var
altitude
=
WeatherHelper
.
CalculateAltitude
(
Pressure
.
FromHectopascals
(
hpa
),
Pressure
.
FromHectopascals
(
seaLevelHpa
),
Temperature
.
FromDegreesCelsius
(
celsius
));
Assert
.
Equal
(
expected
,
Math
.
Round
(
altitude
,
2
));
Assert
.
Equal
(
expected
,
Math
.
Round
(
altitude
.
Meters
,
2
));
}
[
Theory
]
...
...
@@ -117,7 +117,7 @@ namespace Iot.Device.Common.Tests
[
InlineData
(
1013.23
,
950
,
546.89
,
15
)]
public
void
SeaLevelPressureIsCalculatedCorrectly
(
double
expected
,
double
pressure
,
double
altitude
,
double
celsius
)
{
var
seaLevelPressure
=
WeatherHelper
.
CalculateSeaLevelPressure
(
Pressure
.
FromHectopascals
(
pressure
),
altitude
,
Temperature
.
FromDegreesCelsius
(
celsius
));
var
seaLevelPressure
=
WeatherHelper
.
CalculateSeaLevelPressure
(
Pressure
.
FromHectopascals
(
pressure
),
Length
.
FromMeters
(
altitude
)
,
Temperature
.
FromDegreesCelsius
(
celsius
));
Assert
.
Equal
(
expected
,
Math
.
Round
(
seaLevelPressure
.
Hectopascals
,
2
));
}
...
...
@@ -127,7 +127,7 @@ namespace Iot.Device.Common.Tests
[
InlineData
(
950.02
,
1013.25
,
546.89
,
15
)]
public
void
PressureIsCalculatedCorrectly
(
double
expected
,
double
seaLevelPressure
,
double
altitude
,
double
celsius
)
{
var
pressure
=
WeatherHelper
.
CalculatePressure
(
Pressure
.
FromHectopascals
(
seaLevelPressure
),
altitude
,
Temperature
.
FromDegreesCelsius
(
celsius
));
var
pressure
=
WeatherHelper
.
CalculatePressure
(
Pressure
.
FromHectopascals
(
seaLevelPressure
),
Length
.
FromMeters
(
altitude
)
,
Temperature
.
FromDegreesCelsius
(
celsius
));
Assert
.
Equal
(
expected
,
Math
.
Round
(
pressure
.
Hectopascals
,
2
));
}
...
...
@@ -137,7 +137,7 @@ namespace Iot.Device.Common.Tests
[
InlineData
(
15
,
950
,
1013.25
,
546.89
)]
public
void
TemperatureIsCalculatedCorrectly
(
double
expected
,
double
pressure
,
double
seaLevelPressure
,
double
altitude
)
{
var
temperature
=
WeatherHelper
.
CalculateTemperature
(
Pressure
.
FromHectopascals
(
pressure
),
Pressure
.
FromHectopascals
(
seaLevelPressure
),
altitude
);
var
temperature
=
WeatherHelper
.
CalculateTemperature
(
Pressure
.
FromHectopascals
(
pressure
),
Pressure
.
FromHectopascals
(
seaLevelPressure
),
Length
.
FromMeters
(
altitude
)
);
Assert
.
Equal
(
expected
,
Math
.
Round
(
temperature
.
DegreesCelsius
,
0
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录