nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 07711c10: Tidy up GeometryUtils a bit 

* commit '07711c10b8a64f26f4ecb1df0bb84df95c7f25d2':
  Tidy up GeometryUtils a bit
main
Ken Wakasa 2012-12-27 19:55:30 -08:00 committed by Android Git Automerger
parent 71ea09d2b3 07711c10b8
commit 3847ce5d96
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
native/jni/src/geometry_utils.h
View File

@ -54,7 +54,7 @@ static AK_FORCE_INLINE int getDistanceInt(const int x1, const int y1, const int
static AK_FORCE_INLINE float getAngle(const int x1, const int y1, const int x2, const int y2) { static AK_FORCE_INLINE float getAngle(const int x1, const int y1, const int x2, const int y2) {
const int dx = x1 - x2; const int dx = x1 - x2;
const int dy = y1 - y2; const int dy = y1 - y2;
if (dx == 0 && dy == 0) return 0; if (dx == 0 && dy == 0) return 0.0f;
return atan2f(static_cast<float>(dy), static_cast<float>(dx)); return atan2f(static_cast<float>(dy), static_cast<float>(dx));
} }
@ -96,6 +96,7 @@ static inline float pointToLineSegSquaredDistanceFloat(const float x, const floa
// Normal distribution N(u, sigma^2). // Normal distribution N(u, sigma^2).
struct NormalDistribution { struct NormalDistribution {
public:
NormalDistribution(const float u, const float sigma) NormalDistribution(const float u, const float sigma)
: mU(u), mSigma(sigma), : mU(u), mSigma(sigma),
mPreComputedNonExpPart(1.0f / sqrtf(2.0f * M_PI_F * SQUARE_FLOAT(sigma))), mPreComputedNonExpPart(1.0f / sqrtf(2.0f * M_PI_F * SQUARE_FLOAT(sigma))),
@ -108,10 +109,10 @@ struct NormalDistribution {
private: private:
DISALLOW_IMPLICIT_CONSTRUCTORS(NormalDistribution); DISALLOW_IMPLICIT_CONSTRUCTORS(NormalDistribution);
float mU; // mean value const float mU; // mean value
float mSigma; // standard deviation const float mSigma; // standard deviation
float mPreComputedNonExpPart; // = 1 / sqrt(2 * PI * sigma^2) const float mPreComputedNonExpPart; // = 1 / sqrt(2 * PI * sigma^2)
float mPreComputedExponentPart; // = -1 / (2 * sigma^2) const float mPreComputedExponentPart; // = -1 / (2 * sigma^2)
}; // struct NormalDistribution }; // struct NormalDistribution
} // namespace latinime } // namespace latinime
#endif // LATINIME_GEOMETRY_UTILS_H #endif // LATINIME_GEOMETRY_UTILS_H