VSAG/amadeus_26_fb
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new' into new

Browse Source
This commit is contained in:
xinyang
2019-07-29 20:09:50 +08:00
parent 7c4e6d27f6 af9a254dc1
commit 6d8597fb0b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
armor/src/armor_finder/anti_top/anti_top.cpp
View File

@@ -23,10 +23,10 @@ static double mean(RoundQueue<double, length> &vec) {
}
ArmorFinder::BoxRatioChangeType ArmorFinder::getRatioChangeType(RoundQueue<double, 5> &vec) {
auto d = (vec[0] - vec[1] + vec[3] + vec[4]) / 3.0;
if (d > 0.1) {
auto d = (vec[0] - vec[1] + vec[3] + vec[4]);
if (d > 0.15) {
return INCREASE;
} else if (d < -0.1) {
} else if (d < -0.15) {
return DECREASE;
} else {
return NOCHANGE;

2
armor/src/armor_finder/armor_box/armor_box.cpp
View File

@@ -47,7 +47,7 @@ ArmorBox::BoxOrientation ArmorBox::getOrientation() const {
case B1:
case B7:
case B8:
if (lengthDistanceRatio() < 0.28) {
if (lengthDistanceRatio() < 0.26) {
return FRONT;
} else {
return SIDE;