fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-01 07:24:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "TransferID::subtracted()"

Browse Source 
This reverts commit c36fdb21561ca70cc907caf32da65b122218211c.
This commit is contained in:
Pavel Kirienko 2015-07-20 12:40:27 +03:00
parent c36fdb2156
commit 29aff593aa
3 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libuavcan/include/uavcan/transport/transfer.hpp
View File

@ -104,11 +104,6 @@ public:
* Amount of increment() calls to reach rhs value.
*/
int computeForwardDistance(TransferID rhs) const;
/**
* Difference between two TransferID values with proper wraparound handling.
*/
int subtracted(TransferID rhs) const;
};

7
libuavcan/src/transport/uc_transfer.cpp
View File

@ -52,11 +52,4 @@ int TransferID::computeForwardDistance(TransferID rhs) const
return d;
}
int TransferID::subtracted(TransferID rhs) const
{
const int x = rhs.computeForwardDistance(*this);
return (x >= ((1 << BitLen) / 2)) ? (x - (1 << BitLen)) : x;
}
}

26
libuavcan/test/transport/transfer.cpp
View File

@ -15,7 +15,7 @@ TEST(Transfer, TransferID)
ASSERT_EQ(32, 1 << TransferID::BitLen);
/*
* computeForwardDistance()
* forwardDistance()
*/
EXPECT_EQ(0, TransferID(0).computeForwardDistance(0));
EXPECT_EQ(1, TransferID(0).computeForwardDistance(1));
@ -28,30 +28,6 @@ TEST(Transfer, TransferID)
EXPECT_EQ(30,TransferID(7).computeForwardDistance(5));
EXPECT_EQ(5, TransferID(0).computeForwardDistance(5));
/*
* subtracted()
*/
EXPECT_EQ(0, TransferID(0).subtracted(0));
EXPECT_EQ(-1, TransferID(0).subtracted(1));
EXPECT_EQ(-7, TransferID(0).subtracted(7));
EXPECT_EQ(0, TransferID(7).subtracted(7));
EXPECT_EQ(1, TransferID(31).subtracted(30));
EXPECT_EQ(-1, TransferID(31).subtracted(0));
EXPECT_EQ(2, TransferID(7).subtracted(5));
EXPECT_EQ(-5, TransferID(0).subtracted(5));
EXPECT_EQ(-1, TransferID(15).subtracted(16));
EXPECT_EQ(1, TransferID(16).subtracted(15));
EXPECT_EQ(-16, TransferID(10).subtracted(26));
EXPECT_EQ(14, TransferID(24).subtracted(10));
EXPECT_EQ(15, TransferID(25).subtracted(10));
EXPECT_EQ(-16, TransferID(26).subtracted(10));
EXPECT_EQ(-15, TransferID(27).subtracted(10));
EXPECT_EQ(-14, TransferID(28).subtracted(10));
/*
* Misc
*/