Satoshi Kataoka
f144cc61cc
Merge "Step 24-A remove setdict" into jb-mr1-dev
2012-08-13 00:20:12 -07:00
Satoshi Kataoka
ddb12ea63a
Step 24-A remove setdict
...
Change-Id: Iab28bf0fd785b9e81fc86837e64a1ef2e315a229
2012-08-13 14:32:17 +09:00
Ken Wakasa
507113a1bb
Fix typo in include guard macro, and some cleanups.
...
Change-Id: I455f6a52667b1c6ae5eb9f58b3494dd87eb2c3f5
2012-08-13 11:51:37 +09:00
Ken Wakasa
bcec82de66
Clean up constructors
...
And, use C++ style casts and use float math functions rather than double ones to save memory space.
Also, stop using FloatMath and NativeUtils as standard Math methods are faster now.
See http://code.google.com/p/android/issues/detail?id=36199 and https://android-review.googlesource.com/40700
multi-project commit with I4259fb5ab8a15ac5760a7f04fc8f4c860529f04a
Change-Id: I0b81cff8c91769f7559a59b9528c75a5aabb4211
2012-08-13 10:48:37 +09:00
satok
847c8dfe17
Fix JNI
...
Change-Id: If134baf52e78fbe18b78611a23870f5d10c80955
2012-08-11 13:54:01 +09:00
Ken Wakasa
063c3e2171
Fix memset() bugs
...
Change-Id: Icf4341c0a62e782cf8c2a863408591df4e6f07cb
2012-08-10 22:13:21 +09:00
Ken Wakasa
f3850e5543
Use JNI Region calls also in getSuggestions()
...
Change-Id: I9cc0208397c202aeb6f7b5bb5ad59e00c5afbd80
2012-08-10 21:09:23 +09:00
Satoshi Kataoka
f6c2200890
Workaround to stop init dict traverse session
...
Change-Id: I3d46c54a96a9fc0359ef75b9d2f8590b44164a8b
2012-08-10 21:07:53 +09:00
Satoshi Kataoka
0f4de30e58
Fix a bug on jni of DicTraverseSession
...
Change-Id: Ieeac36cbad9a99d15911f2e6e2e841cae38ecb9b
2012-08-10 20:13:57 +09:00
Satoshi Kataoka
88dfeb30bf
step 23-A remove unused method
...
Change-Id: I382c654fd30aca1a3277a186ee25fc946449c639
2012-08-10 19:35:04 +09:00
Satoshi Kataoka
c14d55a289
Merge "Step 22-A implement session" into jb-mr1-dev
2012-08-10 02:06:05 -07:00
Satoshi Kataoka
6b4a1d79eb
Step 22-A implement session
...
Change-Id: Ida63382ffb756e20cc5b17c2702d2895e7e6e889
2012-08-10 18:06:04 +09:00
Jean Chalard
dc2fb6bc6d
Merge "Pass the type from native code all the way to Java." into jb-mr1-dev
2012-08-10 01:26:59 -07:00
Jean Chalard
926ef06a1e
Pass the type from native code all the way to Java.
...
Bug: 6906525
Change-Id: I057390d47a223450e22d8338509e22c28fc0d5f6
2012-08-10 15:51:55 +09:00
Satoshi Kataoka
e9f3e182e4
Add arguments for dic traverse session
...
Change-Id: I8776ad528eeea9a5fc4dcf394ca13bb80c04fb6d
2012-08-10 12:34:00 +09:00
Ken Wakasa
5bb4206275
Use more JNI Region calls
...
Change-Id: I371db517ff4749c0b7e5bdb4362e6310c91a24dc
2012-08-10 00:46:20 +09:00
Ken Wakasa
04a89132e9
Use GetStringUTFRegion for filename
...
Change-Id: I2e9ad092ccf4c23c1c6b71916c962994314d37b6
2012-08-09 23:27:58 +09:00
Ken Wakasa
9e0c711a62
Stop using STL string in additional_proximity_chars
...
Change-Id: Ic016fd5983b8855b0fd9506a17b205db86af3a2f
2012-08-09 22:28:57 +09:00
Ken Wakasa
805ac949d2
Fix string.compare() logic. It happens to be working luckily.
...
Change-Id: I262c6d5779124e5b09ad1a66ca3c9ddb2fc6d7d5
2012-08-09 19:36:58 +09:00
Ken Wakasa
71b379df51
Merge "Use GetStringUTFRegion" into jb-mr1-dev
2012-08-09 02:54:38 -07:00
Satoshi Kataoka
9d29871605
Add reset method for dic travserse session
...
Change-Id: Ia3dd924f92549da2cf8302ef77c629902d4f275b
2012-08-09 17:49:19 +09:00
Ken Wakasa
0151145924
Use GetStringUTFRegion
...
Change-Id: I56ad66af4ee42ed32a6fd909a9a34d601874783a
2012-08-09 16:05:54 +09:00
Satoshi Kataoka
60d4961f34
Merge "Pass traverse session" into jb-mr1-dev
2012-08-08 07:50:44 -07:00
Satoshi Kataoka
9127811493
Pass traverse session
...
Change-Id: I84bfaaa406e3f51421c08a7ee8f9576ebdba54d4
2012-08-08 23:30:31 +09:00
Ken Wakasa
bb005f787f
Start using JNI's Get<Type>ArrayRegion()
...
Change-Id: Iaa1014efe639dd79540835b0d5201093dbd8dab8
2012-08-08 21:06:52 +09:00
Satoshi Kataoka
181567f9c7
Merge "Add traverse session" into jb-mr1-dev
2012-08-08 04:40:36 -07:00
Satoshi Kataoka
c4e4dfe17d
Add traverse session
...
Bug: 6942265
Change-Id: I384cf701f5ee44c4b1037e5b8ddfa3d570286f55
2012-08-08 20:39:43 +09:00
Ken Wakasa
9b392364b7
Cleanup headers.
...
Change-Id: Ied1bedb8ba5fae590987ea23bed32f4db1a60d77
2012-08-08 17:12:09 +09:00
Ken Wakasa
e2a6badf60
Merge "Show results in the native code." into jb-mr1-dev
2012-08-05 19:34:23 -07:00
Satoshi Kataoka
586b0ca1a2
Show results in the native code.
...
Change-Id: I712ba49cf4a89a36836fbf49cd72e7eef218e61f
2012-08-06 11:26:13 +09:00
Ken Wakasa
1d8a246e39
Header cleanup
...
Change-Id: I1aa91708d0de01ca3e84e69ec8d3a3832c386ca8
2012-08-03 18:37:58 +09:00
Ken Wakasa
77e8e81ad9
Header cleanup. Moved a couple of functions from .h to .cpp.
...
Change-Id: Ifd12a7632f75395bd0ef5e394d5c2abd6cbe28c6
2012-08-02 20:19:39 +09:00
Ken Wakasa
74fb957e49
Header cleanup
...
Change-Id: Idaf19de3dc75367d49bc01e84e5a9f057c1f8dba
2012-08-01 18:46:07 +09:00
Jean Chalard
195605084e
Move flags belonging to BinaryFormat to the right place.
...
These masks and flags are constants that are an integral part
of the format. They belong in BinaryFormat and have nothing to
do in UnigramDictionary.
This needs I6751dda4 to not break the build
Bug: 6429243
Change-Id: Ic1c842b3245f7fdc25aa8d1459c5bb07b262e265
2012-08-01 00:23:52 +09:00
Ken Wakasa
f1008c5501
Cleanup headers
...
Change-Id: I9124366b2000cad54966fb6936bb4691bbf115a3
2012-07-31 18:45:26 +09:00
Ken Wakasa
5460ea389d
Misc cleanups
...
Change-Id: I28308f12c3064299acefc346b72279036c3726a7
2012-07-30 16:27:44 +09:00
Ken Wakasa
e3f26dd21e
Fix native debug log
...
Change-Id: If19f808522a5a35fa06c2825fcd0d92e6e4a0631
2012-07-27 18:06:06 +09:00
Ken Wakasa
d3e10bb694
Build LatinIME with NDK r8
...
Change-Id: I0e233f9561f4bb4dee2311b98e7b0a1cd9cd5061
2012-07-27 09:39:21 +09:00
Ken Wakasa
0bbb917d12
Cosmetic fixes and style fixes
...
Change-Id: I69c42ff945cdf0d5205c6ca61d6861a0479492dc
2012-07-25 18:56:51 +09:00
Tom Ouyang
eb2fe2ab10
Add wrapper for incremental decoder.
...
Change-Id: Ie11e2b83c2602c0d5a2739a7d4f4994f80d7e298
2012-07-19 17:50:40 +09:00
Jean Chalard
c7387a4fd0
Add values for suggestion types (A120)
...
Also, use it in getBigrams.
Change-Id: Ia0be9b57d1b7effcd8a936e01e957d1195b39c68
2012-07-12 19:21:44 +09:00
Jean Chalard
6931df9c17
Pass an array to output suggestion types (A119a)
...
This needs the matching A119b change to not break the build.
The array is passed, but not used yet.
Bug: 6166228
Change-Id: Ia91d658461d989ee8c94e9b31bb06f4a36f4c5b6
2012-07-12 19:21:42 +09:00
Jean Chalard
3b57631b60
Resolve a TODO: bury some implementation detail in native (A110)
...
The fact that prediction does not accept a null argument is an
implementation detail, it should not be visible to Java code.
Change-Id: I3a156b323b6db9353de898d33f3f7c81751cecb1
2012-07-12 14:30:30 +09:00
Jean Chalard
18d76afa91
Remove an unused method (A109)
...
Change-Id: Ib785b7e8c554d030395e2c0ca92edb44eb2b245f
2012-07-12 14:30:03 +09:00
Jean Chalard
cc470c78e4
Move an implementation detail to native code (A107)
...
Java code does not have to know about this implementation detail:
the generic method should do the dispatching, instead of having
the caller call either method.
Change-Id: Ic13727f0cb18f4ced2c356cce2f8d710588c0421
2012-07-12 13:09:44 +09:00
Jean Chalard
6a5d17cd2f
Remove a useless parameter (A106)
...
Change-Id: Ic0ecea22212fd1a098a3a168da460374e446f4a3
2012-07-12 11:28:16 +09:00
Jean Chalard
1a69ad5a10
Remove a constant parameter (A105)
...
Change-Id: I8a09fa2f0649880c943364699a07652e47dede22
2012-07-12 11:27:55 +09:00
Jean Chalard
b7d7c5a369
Make a constant really constant (A104)
...
Change-Id: Ied1f9f96a574b1e6a8ee0a71bfb1604d9c962e1c
2012-07-12 11:16:30 +09:00
Ken Wakasa
ea92b7b987
Avoid LatinIME crash
...
bug: 6790620
Change-Id: I6fd271c6f79790cfb9d875b052854eab60a30b7f
2012-07-10 09:57:04 +09:00
Ying Wang
0493bb2f10
Use TARGET_BUILD_APPS to distinguish
...
It's in a full build or just an unbundled build.
Bug: 6790620
Change-Id: Ifa2df86462747acb8b561ebab879e03b1201b4f7
2012-07-09 17:47:31 -07:00
Ken Wakasa
f52c1c50ef
Revert "Fix the build"
...
This reverts commit 48a436081f
.
2012-07-06 15:53:51 +09:00
Ken Wakasa
48a436081f
Fix the build
...
Change-Id: Iff324c705b46cfae27ea9b6b8dc8b0a0d56a193d
2012-07-06 15:35:13 +09:00
Ken Wakasa
c646102b94
Update Makefile of LatinIME native code for the unbundled build
...
Change-Id: I117e2429c5f5e75a6ffe84b5869afb2e033f2b2d
2012-07-06 15:17:11 +09:00
Jean Chalard
e9a86e2cdb
Search bigrams for the lower case version of the word (A46)
...
...if there aren't any for the exact case version.
Bug: 6752830
Change-Id: I2737148b01ba04a64febe009ceb2ef53c265d224
2012-07-04 20:12:58 +09:00
Satoshi Kataoka
deb0987274
Cleanup gesture code overlay
...
Change-Id: I6ab1462f62b2d53a157494d27342a832ec1f15f7
2012-07-04 12:43:36 +09:00
Ken Wakasa
0336ec4e12
Reorganize LatinIME native Makefile a bit more
...
Change-Id: Iabb6caa620cb587110a3d88ce7129ed978eea83a
2012-07-03 00:11:03 +09:00
Ken Wakasa
8658e552f3
Makefile and source code structure update for LatinIME AOSP build
...
Change-Id: Ia2ab54651ef96521fce01fe4755147909b818803
2012-07-02 20:20:42 +09:00
Satoshi Kataoka
737c87a5f1
Merge "Accept external debug flag in native code"
2012-06-28 22:56:04 -07:00
Satoshi Kataoka
6b8e79bc25
Merge "Add a new define for gesture"
2012-06-28 21:03:18 -07:00
Satoshi Kataoka
3ffaf39281
Accept external debug flag in native code
...
Change-Id: I762fd9025ffd6518daf42903875d6ca0a5389ff4
2012-06-29 12:54:36 +09:00
Ken Wakasa
8fcd7694ae
Update LatinIME native Makefile for gesture code
...
Also, a small clean up in the proguard.flags file
Change-Id: I860034c51a2abf448f7ecc250ed35687b1f1dd82
2012-06-29 00:06:14 +09:00
Satoshi Kataoka
712e02fba7
Add a new define for gesture
...
Change-Id: I6e0d8de75e129a6d1a33f7c7d5f5fa8c11dd2006
2012-06-28 15:13:57 +09:00
Jean Chalard
a238e393b9
Merge "Cleanup the dictionary type."
2012-06-27 01:55:45 -07:00
Satoshi Kataoka
2f6817e567
Add skeleton implementations for gesture
...
Change-Id: I169034eba2001b98bad8f8a05372426c3ff8774e
2012-06-27 17:34:06 +09:00
Jean Chalard
05efe576f9
Cleanup the dictionary type.
...
Stop storing an int in each of the different class types, and
just store a string in the top class.
Change-Id: I2af1832743e6fe78e5c1364f6d9cc21252bf5831
2012-06-27 17:31:09 +09:00
Satoshi Kataoka
efb63246c2
Change native functions' interface for gesture
...
Change-Id: I106a858f0be7452dd89f425805a6f72aa88c3f65
2012-06-27 16:22:39 +09:00
Satoshi Kataoka
91eb4d898e
Add skeleton classes for gesture
...
Change-Id: I6ada110a934b0dafc57d0dcd87723275fa733548
2012-06-26 17:33:03 +09:00
Satoshi Kataoka
7368009799
Change JNI for Gesture
...
Change-Id: I774a0052038d16677f60f7efa11fd266cb5f3088
2012-06-25 18:54:37 +09:00
satok
b1ed1d47ac
Make native bigram dictionary const
...
Change-Id: Id883f2d69483c9234877ad42446a582258e1cf91
2012-06-14 18:01:27 -07:00
satok
1bc038c5e4
Move correction state to stack memory
...
*Before
(0) 13.18 (0.01%)
(1) 93025.41 (62.06%)
(2) 10.75 (0.01%)
(3) 10.50 (0.01%)
(4) 117.50 (0.08%)
(5) 55678.98 (37.14%)
(6) 9.09 (0.01%)
(20) 883.84 (0.59%)
Total 149898.24 (sum of others 149749.25)
*After
(0) 17.41 (0.01%)
(1) 92673.41 (61.95%)
(2) 10.62 (0.01%)
(3) 10.37 (0.01%)
(4) 120.96 (0.08%)
(5) 55741.18 (37.26%)
(6) 11.01 (0.01%)
(20) 862.72 (0.58%)
Total 149595.52 (sum of others 149447.68)
Change-Id: Ia5a25a544fc388e4dab1e08d8f78d5117b249cf3
2012-06-14 15:57:28 -07:00
satok
1035bc990d
Fix debug build
...
Change-Id: I48a87967ac741455502ac1a18465ae6ed7ef0d12
2012-06-13 16:07:54 -07:00
Ken Wakasa
e7b34b9f86
Add NativeUtils.powf()
...
Change-Id: I0339f39d49bc6390d098017f32d92c776974e03e
2012-06-08 20:46:19 +09:00
Satoshi Kataoka
6bc051d291
Refactor step3: const unigram_dictionary
...
- make all functions in unigram_dictionary const
Change-Id: I94a64865aa793435e6c81890e68d999f6374074e
2012-06-08 20:04:36 +09:00
Satoshi Kataoka
4a3db7057f
refactor native step 2
...
- proximity_info is now stateless
Change-Id: I62725bfe05b161fa8fc050ea6b50867e10a354e2
2012-06-08 18:14:49 +09:00
Satoshi Kataoka
3e8c58f68d
Separate state from proximity_info step1
...
Bug: 6548943
Change-Id: I7b4fbe20615a28151a74875be43b9f4a20e0dce9
2012-06-07 13:35:34 +09:00
Satoshi Kataoka
02963c4032
am fb3fdf15: Merge "Enhance the safety net in multiple word suggestions" into jb-dev
...
* commit 'fb3fdf15040cb67c311047dea0144fa5aa071185':
Enhance the safety net in multiple word suggestions
2012-05-31 01:14:57 -07:00
Satoshi Kataoka
67e3cc8488
Enhance the safety net in multiple word suggestions
...
Bug: 6576793
Change-Id: I97100b482d3cf4e1b417c197b5d1e971a72b998d
2012-05-31 17:07:31 +09:00
Satoshi Kataoka
d8096b1a12
am 6cbe204f: Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
...
* commit '6cbe204fce109fab652da15f4c8ea1ae35fca3e7':
Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
2012-05-30 02:50:29 -07:00
Satoshi Kataoka
6cbe204fce
Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
...
Bug: 6576793
Change-Id: I46f56654cd25dc28668ad75ac71e0e3beb8cdcf3
2012-05-30 18:43:23 +09:00
Jean Chalard
987aa1536b
am 62cd919d: Remove a compiler warning.
...
* commit '62cd919dca9ef85cdd045b539b3ef85e921c6e4c':
Remove a compiler warning.
2012-05-29 22:54:21 -07:00
Jean Chalard
62cd919dca
Remove a compiler warning.
...
Change-Id: Id2c949d03a2e38787cbf3c8f99313bcfe8610a1f
2012-05-30 14:46:43 +09:00
Satoshi Kataoka
40ab25cab0
am 51705efc: Merge "Add a JNI to get the frequency" into jb-dev
...
* commit '51705efc96c1c555cf9e0f557ea8cdc1c1c97781':
Add a JNI to get the frequency
2012-05-29 01:30:26 -07:00
Satoshi Kataoka
51705efc96
Merge "Add a JNI to get the frequency" into jb-dev
2012-05-29 01:27:59 -07:00
Satoshi Kataoka
2f854e170c
Add a JNI to get the frequency
...
Bug: 4192129
Change-Id: I3f220f5a10114d4eb23956148076cf76220bda0f
2012-05-29 17:21:59 +09:00
Jean Chalard
e3864d429e
am b074dfea: Merge "Add a comment on a caveat for future reference." into jb-dev
...
* commit 'b074dfead504fba4039e4eaaded07c10244ff292':
Add a comment on a caveat for future reference.
2012-05-29 00:59:14 -07:00
Jean Chalard
46fe49fc05
Add a comment on a caveat for future reference.
...
Change-Id: I328a0cd4346275aac960e1369bf370688a004e11
2012-05-29 16:50:25 +09:00
Jean Chalard
18f650172d
am bfba64bc: Merge "Compute the correct frequency for bigram prediction" into jb-dev
...
* commit 'bfba64bcfd70ce8e3932d52c4b9f3182d33e1f55':
Compute the correct frequency for bigram prediction
2012-05-29 00:38:16 -07:00
Jean Chalard
e382bcc39a
am 8f9f55dd: Merge "Fix a bug where the bigram freq would be underevaluated" into jb-dev
...
* commit '8f9f55dd9d27f6c759c12416c872138b9b4661dc':
Fix a bug where the bigram freq would be underevaluated
2012-05-29 00:25:50 -07:00
Jean Chalard
c941bc9bd3
am 22cf6958: Merge "Split a method to reconstruct freq from uni/bi freq" into jb-dev
...
* commit '22cf695834009929a6c0fbcd75a9ff56efa04d83':
Split a method to reconstruct freq from uni/bi freq
2012-05-29 00:25:49 -07:00
Jean Chalard
ca134ccc2a
am bf61bba3: Merge "Fix two small possible bugs." into jb-dev
...
* commit 'bf61bba35feda09a2ad08475481ce042879ff5bb':
Fix two small possible bugs.
2012-05-29 00:25:47 -07:00
Jean Chalard
e308459531
Compute the correct frequency for bigram prediction
...
Change-Id: I3196f48a0ca2ed5e94f430254d58e65d341398c8
2012-05-29 16:22:46 +09:00
Jean Chalard
cb99376307
Fix a bug where the bigram freq would be underevaluated
...
The difference in score is not large, but it's still a bug
Change-Id: Ie22c2b6e1206e829c1c8af096469df05af14d47b
2012-05-29 16:04:07 +09:00
Jean Chalard
19ebd93646
Split a method to reconstruct freq from uni/bi freq
...
This has no impact at all on the logic.
Change-Id: I3788c8335cc193433ad9a7512b211a49bb2ffb02
2012-05-29 16:00:25 +09:00
Jean Chalard
402b057050
Fix two small possible bugs.
...
None of these had any real impact, but they were potential
liabilities for the future
Change-Id: I2de581f8b638e423d47a6d99b1a3c96af4c6150d
2012-05-29 15:56:30 +09:00
Ken Wakasa
7d81f31871
am 7b1570e6: Merge "Cleanup Makefiles of LatinIME" into jb-dev
...
* commit '7b1570e60c2e04fe7d132df758476b34685eb709':
Cleanup Makefiles of LatinIME
2012-05-23 20:22:04 -07:00
Ken Wakasa
dd58065733
Cleanup Makefiles of LatinIME
...
Change-Id: Id4c6700bc045825eb64fb2b7ae57f23a6211441d
2012-05-24 12:08:59 +09:00
satok
074e8c9206
am a0ac31fc: Fix the issue on multiple words suggestion
...
* commit 'a0ac31fcaa01c21592a6e7af243c14dada65cf3e':
Fix the issue on multiple words suggestion
2012-05-23 05:06:08 -07:00
satok
a0ac31fcaa
Fix the issue on multiple words suggestion
...
Bug: 6509844
Change-Id: I823074a2b29befc3e60c63699ab4dc7719105c63
2012-05-23 20:40:59 +09:00
Jean Chalard
7557d3c6f3
am bc77adef: Merge "Return the bigram frequency if available." into jb-dev
...
* commit 'bc77adefbb0305c5ec0e41ab01e3a085c47c21eb':
Return the bigram frequency if available.
2012-05-17 03:31:15 -07:00
Jean Chalard
bc77adefbb
Merge "Return the bigram frequency if available." into jb-dev
2012-05-17 03:15:40 -07:00