203b213813
Fix build breakage.
...
Change-Id: I01b00827a3099097c1181a4ae91498a6cd14c3ca
2012-12-10 19:13:47 +09:00
a21187188f
Rename function
...
Change-Id: Ia05d4b96158b17d4feef8f2d6ebd52e9dd69b25f
2012-12-06 19:08:45 +09:00
0ed8c6ee29
turn off debug flags
...
Change-Id: I08710abe3e158ee48c954289fc6bb1269c4a7126
2012-12-06 15:12:50 +09:00
aa5a3e84ad
Clean up int types in the Dictionary class
...
Change-Id: I49821c00186ce2a282bb23f369eb140b47d6c455
2012-12-03 19:54:30 +09:00
1d516fb1b0
Clean up int types
...
Change-Id: Ib6819b9d7f00208f47533d7ab3d2e02ca3730981
2012-12-03 19:45:52 +09:00
02421af02a
Merge "remove invalid comparison"
2012-12-03 01:27:41 -08:00
94885f572c
remove invalid comparison
...
Change-Id: I162c478debe5897be057998bd22924ed487d01af
2012-12-03 18:15:06 +09:00
17f71ca6bc
Fix offdevice regression test build error
...
Change-Id: I97128108b3bd75c61069517c3f8ce68ecc7bf285
2012-11-30 19:32:45 +09:00
16e9d343c4
Merge "Tweak beeline speed"
2012-11-30 02:08:55 -08:00
6ae8dd4343
Tweak beeline speed
...
Change-Id: I77bbd5e1888281e838d87824dc04a574b1a7ecb7
2012-11-30 02:02:59 +09:00
da439fa461
Merge "Add utilities to read header values."
2012-11-29 03:11:06 -08:00
22025c6a37
Add utilities to read header values.
...
Bug: 7540132
Change-Id: I19d85481135e79d8782f711da5cbb3a5a7bc06f8
2012-11-29 20:08:37 +09:00
2a6f58d902
Prep for GCC 4.7
...
On Galaxy Nexus (./vendor/google/apps/LatinImeGoogle/tests/etc/run-profile.sh -g)
Before
==== test finished, terminate logcat =====
(0) 2506.11 (10.48%)
(1) 21289.22 (89.01%)
(2) 108.29 (0.45%)
(3) 0.00 (0.00%)
(4) 0.00 (0.00%)
(5) 0.00 (0.00%)
(6) 0.00 (0.00%)
(20) 0.00 (0.00%)
Total 23917.44 (sum of others 23903.62)
After
==== test finished, terminate logcat =====
(0) 2499.58 (10.98%)
(1) 20145.66 (88.51%)
(2) 103.17 (0.45%)
(3) 0.00 (0.00%)
(4) 0.00 (0.00%)
(5) 0.00 (0.00%)
(6) 0.00 (0.00%)
(20) 0.00 (0.00%)
Total 22761.98 (sum of others 22748.42)
Change-Id: I662cb361ff9205ef87d640c458b8473df7d54659
2012-11-27 20:11:29 +09:00
11bb2ffd4a
Tidy up SORTED_CHAR_MAP a bit more for obvious Latin chars
...
Change-Id: Ia18eacf4ad3ea882e4ec3cdfebc7f662503660d9
2012-11-26 19:31:09 +09:00
2d27ca6ce3
Update SORTED_CHAR_MAP[] in char_utils.cpp
...
Change-Id: I683793a0fd0ccf41f5a378275ef11def4e70ce76
2012-11-26 17:17:16 +09:00
9af533538e
Calculate point to point duration
...
Change-Id: I4e0cabdbc628658619b7a71dc66aa3bf8a5030b2
2012-11-22 17:03:09 +09:00
41a77f9e6e
am 37fbcb0d: am 6d471258: am c9349db1: Merge "Add a constant for S_INT_MIN" into jb-mr1.1-dev
...
* commit '37fbcb0ddf2bf61f0e432534b671596b1b6f897e':
Add a constant for S_INT_MIN
2012-11-20 19:41:28 -08:00
592f2b315f
Add a constant for S_INT_MIN
...
This is necessary for I807ae4bd
Bug: 7491364
Change-Id: I46ee92a76eb65e80b64538d0300b718eac6a3ddb
2012-11-20 21:25:46 +09:00
97ff1714e2
Tidy up the base char map
...
Change-Id: I1c3119c5db35faaf73180f17a0888224e301c121
2012-11-19 00:24:45 +09:00
b5b434d867
Merge "Cleanup speed related code"
2012-11-16 02:46:12 -08:00
feec20a692
Cleanup speed related code
...
Change-Id: Id6ea99a9e28f20f3ac34b9bfdac1bf62fd7a9a5d
2012-11-16 19:44:14 +09:00
fe9ec6bc7d
Remove unused variables
...
Change-Id: Ia5079368a1bc86ccdf0052445dc6945041c0abca
2012-11-16 19:28:56 +09:00
f25cc4405e
Fix debug logs
...
Change-Id: Ie7dc32f28915df62a7c31bdaed38c0ad7a4b0f1c
2012-11-15 22:48:20 +09:00
1ce96fecf5
Fix debug build error
...
Change-Id: Id18d72093a36d41859744f98238b3b761ddb667e
2012-11-15 19:14:36 +09:00
b240c38ea2
Merge "[DO NOT MERGE] Correct a wrong base character in Russian" into jb-mr1.1-dev
2012-11-14 20:34:15 -08:00
aef0acdbe0
DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
...
Cherrypick of I67a431d8
bug: 7539944
Change-Id: I0d1f9649f30c36b8e464944a5b881c2cb9c05ccf
2012-11-15 00:54:53 +09:00
e3fc8bc54d
Fix an error in the base char table for LETTER L WITH STROKE
...
bug: 7539944
Change-Id: I67a431d8d60f3236fb7d616504c5d0cf2166f486
2012-11-14 20:07:16 +09:00
7c5b89a4d0
Correct a wrong base character in Russian
...
This is the master counterpart of I80cee4b2
Bug: 7516306
Change-Id: I1db4362bf12a98542c5f6fca3ae8010f16bd61a9
2012-11-14 17:09:41 +09:00
f1d0b2b911
[DO NOT MERGE] Correct a wrong base character in Russian
...
Bug: 7516306
Change-Id: I80cee4b2b11e5bfa68c12923049cb612abd0bc7e
2012-11-14 15:50:28 +09:00
ee05f3f5b7
Cleanup basechars.cpp
...
Change-Id: I7b88876f60720182910fab97ef79f3d04fbd81f0
2012-11-10 19:38:26 +09:00
5f2fa6b82c
Tidy up visibility of members of BinaryFormat.
...
Change-Id: I38a00076b82de8e1a19209c67954fe01585f7943
2012-11-05 20:16:52 +09:00
6e66349ed1
Adjust compiler warning options with the offdevice Makefile
...
Make use of AK_FORCE_INLINE for -Winline and better performance
Change-Id: If0016e2ef61c1fe007c83bb1a5133a6b6bde568e
2012-11-05 14:26:53 +09:00
19d844c7a7
Follow up to Ic6af0c596374d936d2b9b31e626fb62bd265ce64
...
Tidy up inline functions with AK_FORCE_INLINE. Moved back some inline methods to header files.
Change-Id: Ibd37b595666ebddda198d9237f19f6712653a8e8
2012-11-03 00:29:40 +09:00
2c2f3a90d8
Add more compiler warning flags
...
Change-Id: Ic6af0c596374d936d2b9b31e626fb62bd265ce64
2012-11-02 18:29:26 +09:00
a323fa6746
A small code cleanup in geometry_utils.h
...
Change-Id: Ie9ff77c661693a1e21d0aa4cfc079bfbf3171f49
2012-11-02 12:25:19 +09:00
44d9c1ebfc
Use sizeof() more safely.
...
Change-Id: I7cffb4d8da847b483cf4bb482508e3c88c4903be
2012-11-01 17:29:50 +09:00
1e61493c50
Use 32-bit code points for suggestions output
...
This is a multi-project commit with Ic43dd666
bug: 6526418
Change-Id: I39c1acb4e91d04cd8a4ec5a943c8cf575da75ebc
2012-11-01 00:09:51 +09:00
5f9e008d60
am 005f3768: am 25b4a14e: am d03e065b: Don\'t consider non-words for split word suggestion
...
* commit '005f3768400ce1d7bb29ef69151183084aceeb2c':
Don't consider non-words for split word suggestion
2012-10-17 17:06:11 -07:00
d03e065b86
Don't consider non-words for split word suggestion
...
Bug: 7368683
Change-Id: Iecd8348be788e5a749dafabdf7eddc4a14d901e0
2012-10-18 07:28:18 +09:00
350309aeb8
Evaluate score by alignNextKeyToPath for not in the dictionary word.
...
Change-Id: I68d30e734f8b4f629797d73d6b4745e967bdb09d
2012-10-12 19:46:23 +09:00
1e06a4d8e9
Improve gesture input scoring method 3.
...
Change-Id: I3142cb5ec922e661f0d7c1e1706de6015360b2ff
2012-10-12 13:55:30 +09:00
ff74cc3e5e
Improve gesture input scoring method 2.
...
Align next key to path bases its scoring method on probabilities.
Change-Id: I5247c965b92c0052bfdab8a9b1027bc86eb33218
2012-10-11 13:08:06 +09:00
3873d36128
am 00f3d809: am a62a1926: am 471252b9: Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev
...
* commit '00f3d8094733de407c9cd2669bf579a4d7740328':
Fix a bug in multiple shortcut handling code.
2012-10-09 08:53:55 -07:00
516f9d6ea4
Fix a bug in multiple shortcut handling code.
...
Bug: 7301525
Change-Id: Ib38f5ab4b7e4f7996bccbc6830d46f52fd71c6f9
2012-10-09 20:24:13 +09:00
806eba4524
Improve gesture input scoring method 1.
...
Calculate probabilities for each points in advance.
It enables to input not in the dictionary word.
Change-Id: I8d84642045dc3b8ad49719d9b70dda14457995cd
2012-10-09 19:58:20 +09:00
b02ee3d67a
Make use of the NELEMS and KEYCODE_SPACE macro. Also, remove an unused parameter.
...
Change-Id: I3c7e6c59990c92b0d5e2fb80493e8673cdd37b09
2012-10-09 11:17:50 +09:00
448e732272
Follow up change for I5f166a738f6e84a1b807be
...
Bug: 7283955
Change-Id: Iec716d75e7c8a727b198688f44ef4a8cd1255ec1
2012-10-05 21:39:28 +09:00
441b3e5a90
Fix addtional proximity correction
...
Change-Id: I3125764b98af28ce423dc12cbf0dac321ef22386
2012-10-05 20:54:57 +09:00
5150e154f0
Cleanups in LatinIME native source code
...
Change-Id: I9b5e57583deb2d0c980e66c3dfbfd1e12734bc8e
2012-09-27 19:23:38 +09:00
4d1f3d11db
Merge "Make gestures work correctly on keyboards with accented keys" into jb-mr1-dev
2012-09-26 22:50:50 -07:00
f34ec5aa95
Make gestures work correctly on keyboards with accented keys
...
Examples: Spanish, Russian
Bug: 7225962
Change-Id: I6887bc6d81b84e4a73a74de679b955f7abf0ba4f
2012-09-25 19:36:44 -07:00
edd5b7365f
Fix lower case conversion bug for some characters
...
Bug: 7232296
Change-Id: Iaf3f6be55f1bdc2294533938bb54fedcf25fb0cb
2012-09-25 19:30:09 -07:00
4d75fe9bca
FIX: Wrong way to gesture speed calculation.
...
This is a follow-up to bug: 7165929
Change-Id: I7ad2bbd1f6ef1f74ea8770585f584d4232cb40b5
2012-09-25 13:03:56 +09:00
089c7d43c7
Merge "Use touch position correction in the geometric input" into jb-mr1-dev
2012-09-24 20:27:14 -07:00
0edab9d2fc
Use touch position correction in the geometric input
...
bug: 7108161
Change-Id: I72d51bcfa26f241bec8fa907d64384e7eebe5c5e
2012-09-24 21:58:16 +09:00
2866106959
Using relative speed instead of duration rate for gesture input distance calculation.
...
bug: 7165929
Change-Id: I94fe18c57bf19fe58b5050f2c7b3085c6cba6fa8
2012-09-24 20:02:57 +09:00
a811938d40
Refine gesture point duration calcuation to be more localized
...
Bug: 7165929
Change-Id: I3bb1c2622338023626fe4a879e43a86ac8fd0707
2012-09-19 10:54:52 -07:00
41f12ee27b
Simplify distance calculating method for gesture input.
...
Change-Id: Ic466b787b6cc60e6d23b67c8a7f84ad4d0b521c7
2012-09-19 15:46:00 +09:00
246d227c5d
Fix offdevice full debug build crash
...
Change-Id: I7640863738d1548f7d9cf4b95c4a0d896eb667d7
2012-09-19 01:23:45 +09:00
764dd71203
Stop using GNU extension in-class initializer for non-integral members
...
Change-Id: Ibc8f1c67aba91bdfeceef763ac82d61cc8d2efe1
2012-09-16 01:23:56 +09:00
03dc8fe141
Use more int values in ProximityInfoState::getPointScore()
...
Change-Id: If2f8ce3c7211d28161d64acbad10e3b2abb8e634
2012-09-14 20:35:20 +09:00
1cd7ca9919
Using isSkippableChar instead of '\'' and '-'.
...
Change-Id: I295a72b683b2ebc28a006baa66baf7e1b97100eb
2012-09-14 18:03:10 +09:00
0e301bdc29
Merge "Generalize incremental recognition to non-Latin languages" into jb-mr1-dev
2012-09-13 02:26:54 -07:00
f4554d8b10
Fix an issue on FP calculation diff of osx and linux
...
sugar on mac
result_type=1 expected=<1093> actual=<1047>
result_type=4 expected=<730> actual=<698>
result_type=5 expected=<177> actual=<173>
sugar on linux
result_type=1 expected=<1093> actual=<1047>
result_type=4 expected=<730> actual=<698>
result_type=5 expected=<177> actual=<173>
Change-Id: I4cd39becb0de4076dd37d870adda6463a96de424
2012-09-13 15:13:02 +09:00
132168519e
Generalize incremental recognition to non-Latin languages
...
Bug: 7043019
Change-Id: I9a26f74177d4f8f03b7b65e2e255e4087d5ef8d9
2012-09-12 20:09:18 -07:00
9182daf98c
Output detailed log in ProximityInfoState
...
Change-Id: If6a254e2a116d1b6812f448d38139b7656168be6
2012-09-12 12:19:47 +09:00
040f1c50bf
Merge "Debug flag" into jb-mr1-dev
2012-09-11 01:08:36 -07:00
952ec4977d
Debug flag
...
Change-Id: Ied846162fd5052a33fd3c8596e73dfdd48c446ee
2012-09-11 17:04:10 +09:00
41c2765b44
Remove an unused file.
...
Change-Id: I422d27aae063c4eb17d0e00277cf4492e5b4986e
2012-09-11 14:55:08 +09:00
d45c0faec3
Add debug utils for geometric input
...
Change-Id: If01bd5593cfc7428572aa43253d6d72409ac6b8e
2012-09-10 19:36:38 +09:00
23a57eafbb
Add DEBUG_GEO_FULL flag
...
Change-Id: Ibf8eb5fc2056fd138e9e6af1c13fbc065b44a6f1
2012-09-10 17:59:17 +09:00
5964d4e607
Variable type cleanups
...
Change-Id: I5d892494200c09f8cb8a46c327c29bbd63eab093
2012-09-10 16:49:36 +09:00
1c8fc83dce
Fix backtrace tool
...
Change-Id: Icc0e8ad94331e62a569183fa05ada335dcc5e26a
2012-09-10 12:54:42 +09:00
096f35ff4b
Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
...
Change-Id: I69ad295b660e0c4ba5bb29c8d3d8805291ec43a8
2012-09-07 21:04:12 +09:00
b85df9d5ef
Merge "Fix bug of sampling and become to save corner points for geometric input." into jb-mr1-dev
2012-09-07 00:03:44 -07:00
aba26e4f63
Fix bug of sampling and become to save corner points for geometric input.
...
Change-Id: I6278a1f7fdcc897c1d6c8d4c8e53730087cc2e5e
2012-09-07 16:02:18 +09:00
7914e907b5
Add comments for meaningless lines
...
Change-Id: I20ebe246f6980fd3054c2c7e98b5150eaabbcc77
2012-09-07 08:55:16 +09:00
3051966b8c
Merge "The processNextKey becomes to use actual average duration." into jb-mr1-dev
2012-09-06 05:33:56 -07:00
3811a28ddc
The processNextKey becomes to use actual average duration.
...
Change-Id: I35d8915eb113e513ce8c9f979dbdb8b0b013db50
2012-09-06 20:55:45 +09:00
18ebba3a66
Fix one-off bugs reported by Valgrind
...
Bug: 7108990
Change-Id: I40ba30f50a26b65bcac905fc005ad6bb9cb034cc
2012-09-06 20:37:55 +09:00
cde005c05e
Fix apostrophe issue
...
Bug: 7109083
Change-Id: I47275b1bd5fae023981cae502628f5a8284f49ce
2012-09-05 20:32:35 +09:00
8c220a0aa2
Fix bug that can cause unexpected off-keyboard chars to appear as suggestions.
...
Bug: 7050587
Change-Id: I59ea659a411ab966380fadd3f7f9df3f0866192f
2012-09-04 22:22:43 -07:00
d86d313b31
Fix variable type
...
Change-Id: Ifbee00119ff9801d480ca97bf2aedbb25be25bf4
2012-09-04 20:29:38 +09:00
95a49a527a
Restricting children for gesture input.
...
Change-Id: Id2607ef48e67685b0a71b8c628663eceb6b6fe95
2012-09-04 17:00:24 +09:00
f2789819bd
Cosmetic fixes and a bug fix in UnigramDictionary::testCharGroupForContinuedLikeness().
...
This change has actually been extracted from a change work in progress I4fe423834b8131fb122251892c98228a6e08ba25
Change-Id: I52568fa09da2ea22be7f8bfe9676b7cd73c31fa4
2012-09-04 14:23:37 +09:00
1a397ececf
Merge "Add backtrace tool" into jb-mr1-dev
2012-09-03 05:00:33 -07:00
5540acb676
Add backtrace tool
...
Change-Id: I2795bedf8d8fd545ae411e74b65770d520c715c4
2012-09-03 20:59:05 +09:00
d9c10b1979
Smart sampling for geometric inputs.
...
Gesture:
+1 227
-1 131
+2 0
-2 0
+3 0
-3 0
+4 261
-4 167
+5 73
-5 263
+6 0
-6 0
+7 0
-7 0
Gesture incremental:
+1 228
-1 127
+2 0
-2 0
+3 0
-3 0
+4 269
-4 167
+5 68
-5 271
+6 0
-6 0
+7 0
-7 0
On device:
0: all, 1:initialize
(0) 56285.82 (99.99%)
(1) 3886.59 (6.90%)
->
(0) 42795.78 (99.98%)
(1) 3916.80 (9.15%)
Change-Id: I3eed99cbd75b22fd2d8b5404a4f7e0972f284a85
2012-09-03 17:50:46 +09:00
72b1c93941
Reinstate the shortcut-only attribute
...
Also add the blacklist attribute
Bug: 7005742
Bug: 2704000
Change-Id: Icbe60bdf25bfb098d9e3f20870be30d6aef07c9d
2012-08-31 22:11:52 +09:00
07aea409ba
Fix a bug giving broken characters
...
Bug: 7050587
Change-Id: I54ff7e680c228e78236567bb79832a43086b70c6
2012-08-29 20:13:30 +09:00
95c272596d
Merge "Step 40-A Cleanup touch path" into jb-mr1-dev
2012-08-27 01:02:25 -07:00
923a6a31ae
Merge "Revert "Change the definition of NOT_A_CHARACTER"" into jb-mr1-dev
2012-08-27 00:58:25 -07:00
fba0019ee2
Revert "Change the definition of NOT_A_CHARACTER"
...
This reverts commit a31d180cc3
2012-08-27 00:53:48 -07:00
37b153e205
Step 40-A Cleanup touch path
...
Change-Id: Id22c5ae6afbf040227dc47153b0849bbe38ff66f
2012-08-27 16:30:59 +09:00
76951d8e5a
Merge "Change the definition of NOT_A_CHARACTER" into jb-mr1-dev
2012-08-26 20:32:28 -07:00
a31d180cc3
Change the definition of NOT_A_CHARACTER
...
Change-Id: I519b1e5478abefb1c18cb6e3ab2862be045583de
2012-08-27 12:27:53 +09:00
297f239196
Try using hash_map
...
Change-Id: Icac47d03e1355e83b4dd3b0e3d7739f1dd5a3b98
2012-08-26 18:39:15 +09:00
0d63e6ea84
Fix initialize order.
...
Change-Id: I2686540bc6ed858e6d7ddc05a962c93714b94e1d
2012-08-25 00:03:16 +09:00
162c211b44
Address warnings by -Weffc++
...
Change-Id: Icd60f1ed2ace0b975d8785bc8a386c7944846075
2012-08-24 23:50:39 +09:00
08f00cf55f
Step 39-A Cleanup proximity_info_state
...
Change-Id: I6070929f310f7dc6359d12d62e81d2e2e032c38e
2012-08-24 17:52:36 +09:00
233aad5e5c
Refactor
...
Change-Id: I907126034d9cc821df8353a78f713638dfc322d6
2012-08-24 14:45:54 +09:00
687a244703
Step 38-A Cleanup touch path
...
Change-Id: I9bfac98b9ac10f3812290f21673c4002241eae01
2012-08-23 18:15:43 +09:00
de8a9a8227
Small cleanups
...
Change-Id: Ib66507b8934bc8019a762d24d5311411e044ec84
2012-08-17 13:06:28 +09:00
8af8c15c6b
Allow one-character suggestions.
...
Bug: 6906525
Change-Id: I62117653ac1281f825afc4ebb30f7e786902b750
2012-08-17 11:10:58 +09:00
3083b4b77d
Merge "Fix a debug method" into jb-mr1-dev
2012-08-16 17:59:11 -07:00
cc1062cfd0
Fix a debug method
...
Change-Id: Icf78fb0d5f7caea78f053fffd1ecd4289629964a
2012-08-17 09:24:45 +09:00
fee0ac60b1
Cleanup and fix method visibility.
...
Change-Id: Ia9e8c69da21ce22bf674ec6c7b2536008a360ea3
2012-08-16 19:34:02 +09:00
f6be15cffe
Step 30-A Constize gesture
...
Change-Id: I6c0b89d96532dc1c8ca71bb730ba22de5592ec67
2012-08-15 17:21:53 +09:00
267030dd82
Cleanup casts.
...
Change-Id: I3bf33ca407cc3bee9f5c4c6f929cdb1421b92c50
2012-08-14 19:03:09 +09:00
34710b03e6
A couple of cleanups. Remove unnecessary casts.
...
Change-Id: Ice530aa83a9a688da35aec408be2a60242699157
2012-08-14 18:07:32 +09:00
e7398cdb2b
Step 26-A Cleanup geometory_utils
...
Change-Id: I839c498c85009a5d6428a71f121a2906fd667db8
2012-08-14 03:39:14 +09:00
8c12bd87cc
Merge "Tag the whitelisted entries in native code." into jb-mr1-dev
2012-08-13 03:24:47 -07:00
0fb950858e
Cleanups in geometry_utils.h
...
Change-Id: Ic051703e5b67adfc62753ebd9ab254296719c6e9
2012-08-13 17:47:00 +09:00
b14fc88e48
Tag the whitelisted entries in native code.
...
Since this is already used in Java land, this actually does
activate the whitelist path, and the code is now fully
functional. We still have to remove the old whitelist resource
and to compile the dictionary that includes the whitelist.
Bug: 6906525
Change-Id: Iacde5313e303b9ed792940efaf6bcfa4ee1317bd
2012-08-13 16:35:59 +09:00
f144cc61cc
Merge "Step 24-A remove setdict" into jb-mr1-dev
2012-08-13 00:20:12 -07:00
ddb12ea63a
Step 24-A remove setdict
...
Change-Id: Iab28bf0fd785b9e81fc86837e64a1ef2e315a229
2012-08-13 14:32:17 +09:00
507113a1bb
Fix typo in include guard macro, and some cleanups.
...
Change-Id: I455f6a52667b1c6ae5eb9f58b3494dd87eb2c3f5
2012-08-13 11:51:37 +09:00
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
063c3e2171
Fix memset() bugs
...
Change-Id: Icf4341c0a62e782cf8c2a863408591df4e6f07cb
2012-08-10 22:13:21 +09:00
f3850e5543
Use JNI Region calls also in getSuggestions()
...
Change-Id: I9cc0208397c202aeb6f7b5bb5ad59e00c5afbd80
2012-08-10 21:09:23 +09:00
88dfeb30bf
step 23-A remove unused method
...
Change-Id: I382c654fd30aca1a3277a186ee25fc946449c639
2012-08-10 19:35:04 +09:00
c14d55a289
Merge "Step 22-A implement session" into jb-mr1-dev
2012-08-10 02:06:05 -07:00
6b4a1d79eb
Step 22-A implement session
...
Change-Id: Ida63382ffb756e20cc5b17c2702d2895e7e6e889
2012-08-10 18:06:04 +09:00
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
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
e9f3e182e4
Add arguments for dic traverse session
...
Change-Id: I8776ad528eeea9a5fc4dcf394ca13bb80c04fb6d
2012-08-10 12:34:00 +09:00
9e0c711a62
Stop using STL string in additional_proximity_chars
...
Change-Id: Ic016fd5983b8855b0fd9506a17b205db86af3a2f
2012-08-09 22:28:57 +09:00
805ac949d2
Fix string.compare() logic. It happens to be working luckily.
...
Change-Id: I262c6d5779124e5b09ad1a66ca3c9ddb2fc6d7d5
2012-08-09 19:36:58 +09:00
0151145924
Use GetStringUTFRegion
...
Change-Id: I56ad66af4ee42ed32a6fd909a9a34d601874783a
2012-08-09 16:05:54 +09:00
60d4961f34
Merge "Pass traverse session" into jb-mr1-dev
2012-08-08 07:50:44 -07:00
9127811493
Pass traverse session
...
Change-Id: I84bfaaa406e3f51421c08a7ee8f9576ebdba54d4
2012-08-08 23:30:31 +09:00
bb005f787f
Start using JNI's Get<Type>ArrayRegion()
...
Change-Id: Iaa1014efe639dd79540835b0d5201093dbd8dab8
2012-08-08 21:06:52 +09:00
9b392364b7
Cleanup headers.
...
Change-Id: Ied1bedb8ba5fae590987ea23bed32f4db1a60d77
2012-08-08 17:12:09 +09:00
586b0ca1a2
Show results in the native code.
...
Change-Id: I712ba49cf4a89a36836fbf49cd72e7eef218e61f
2012-08-06 11:26:13 +09:00
77e8e81ad9
Header cleanup. Moved a couple of functions from .h to .cpp.
...
Change-Id: Ifd12a7632f75395bd0ef5e394d5c2abd6cbe28c6
2012-08-02 20:19:39 +09:00
74fb957e49
Header cleanup
...
Change-Id: Idaf19de3dc75367d49bc01e84e5a9f057c1f8dba
2012-08-01 18:46:07 +09:00
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
f1008c5501
Cleanup headers
...
Change-Id: I9124366b2000cad54966fb6936bb4691bbf115a3
2012-07-31 18:45:26 +09:00
5460ea389d
Misc cleanups
...
Change-Id: I28308f12c3064299acefc346b72279036c3726a7
2012-07-30 16:27:44 +09:00
e3f26dd21e
Fix native debug log
...
Change-Id: If19f808522a5a35fa06c2825fcd0d92e6e4a0631
2012-07-27 18:06:06 +09:00
0bbb917d12
Cosmetic fixes and style fixes
...
Change-Id: I69c42ff945cdf0d5205c6ca61d6861a0479492dc
2012-07-25 18:56:51 +09:00
eb2fe2ab10
Add wrapper for incremental decoder.
...
Change-Id: Ie11e2b83c2602c0d5a2739a7d4f4994f80d7e298
2012-07-19 17:50:40 +09:00
c7387a4fd0
Add values for suggestion types (A120)
...
Also, use it in getBigrams.
Change-Id: Ia0be9b57d1b7effcd8a936e01e957d1195b39c68
2012-07-12 19:21:44 +09:00
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
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
6a5d17cd2f
Remove a useless parameter (A106)
...
Change-Id: Ic0ecea22212fd1a098a3a168da460374e446f4a3
2012-07-12 11:28:16 +09:00
1a69ad5a10
Remove a constant parameter (A105)
...
Change-Id: I8a09fa2f0649880c943364699a07652e47dede22
2012-07-12 11:27:55 +09:00
b7d7c5a369
Make a constant really constant (A104)
...
Change-Id: Ied1f9f96a574b1e6a8ee0a71bfb1604d9c962e1c
2012-07-12 11:16:30 +09:00
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
deb0987274
Cleanup gesture code overlay
...
Change-Id: I6ab1462f62b2d53a157494d27342a832ec1f15f7
2012-07-04 12:43:36 +09:00
8658e552f3
Makefile and source code structure update for LatinIME AOSP build
...
Change-Id: Ia2ab54651ef96521fce01fe4755147909b818803
2012-07-02 20:20:42 +09:00
6b8e79bc25
Merge "Add a new define for gesture"
2012-06-28 21:03:18 -07:00
712e02fba7
Add a new define for gesture
...
Change-Id: I6e0d8de75e129a6d1a33f7c7d5f5fa8c11dd2006
2012-06-28 15:13:57 +09:00
a238e393b9
Merge "Cleanup the dictionary type."
2012-06-27 01:55:45 -07:00
2f6817e567
Add skeleton implementations for gesture
...
Change-Id: I169034eba2001b98bad8f8a05372426c3ff8774e
2012-06-27 17:34:06 +09:00
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
efb63246c2
Change native functions' interface for gesture
...
Change-Id: I106a858f0be7452dd89f425805a6f72aa88c3f65
2012-06-27 16:22:39 +09:00
91eb4d898e
Add skeleton classes for gesture
...
Change-Id: I6ada110a934b0dafc57d0dcd87723275fa733548
2012-06-26 17:33:03 +09:00
7368009799
Change JNI for Gesture
...
Change-Id: I774a0052038d16677f60f7efa11fd266cb5f3088
2012-06-25 18:54:37 +09:00
b1ed1d47ac
Make native bigram dictionary const
...
Change-Id: Id883f2d69483c9234877ad42446a582258e1cf91
2012-06-14 18:01:27 -07:00
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
1035bc990d
Fix debug build
...
Change-Id: I48a87967ac741455502ac1a18465ae6ed7ef0d12
2012-06-13 16:07:54 -07:00
6bc051d291
Refactor step3: const unigram_dictionary
...
- make all functions in unigram_dictionary const
Change-Id: I94a64865aa793435e6c81890e68d999f6374074e
2012-06-08 20:04:36 +09:00
4a3db7057f
refactor native step 2
...
- proximity_info is now stateless
Change-Id: I62725bfe05b161fa8fc050ea6b50867e10a354e2
2012-06-08 18:14:49 +09:00
3e8c58f68d
Separate state from proximity_info step1
...
Bug: 6548943
Change-Id: I7b4fbe20615a28151a74875be43b9f4a20e0dce9
2012-06-07 13:35:34 +09:00
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
67e3cc8488
Enhance the safety net in multiple word suggestions
...
Bug: 6576793
Change-Id: I97100b482d3cf4e1b417c197b5d1e971a72b998d
2012-05-31 17:07:31 +09:00
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
6cbe204fce
Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
...
Bug: 6576793
Change-Id: I46f56654cd25dc28668ad75ac71e0e3beb8cdcf3
2012-05-30 18:43:23 +09:00
987aa1536b
am 62cd919d: Remove a compiler warning.
...
* commit '62cd919dca9ef85cdd045b539b3ef85e921c6e4c':
Remove a compiler warning.
2012-05-29 22:54:21 -07:00
62cd919dca
Remove a compiler warning.
...
Change-Id: Id2c949d03a2e38787cbf3c8f99313bcfe8610a1f
2012-05-30 14:46:43 +09:00
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
51705efc96
Merge "Add a JNI to get the frequency" into jb-dev
2012-05-29 01:27:59 -07:00
2f854e170c
Add a JNI to get the frequency
...
Bug: 4192129
Change-Id: I3f220f5a10114d4eb23956148076cf76220bda0f
2012-05-29 17:21:59 +09:00
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
46fe49fc05
Add a comment on a caveat for future reference.
...
Change-Id: I328a0cd4346275aac960e1369bf370688a004e11
2012-05-29 16:50:25 +09:00
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
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
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
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
e308459531
Compute the correct frequency for bigram prediction
...
Change-Id: I3196f48a0ca2ed5e94f430254d58e65d341398c8
2012-05-29 16:22:46 +09:00
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
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
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
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
a0ac31fcaa
Fix the issue on multiple words suggestion
...
Bug: 6509844
Change-Id: I823074a2b29befc3e60c63699ab4dc7719105c63
2012-05-23 20:40:59 +09:00
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
bc77adefbb
Merge "Return the bigram frequency if available." into jb-dev
2012-05-17 03:15:40 -07:00
cd7c41352f
Fix build
...
Change-Id: I799811aa3afb59bba2e4086a063f5da03669bba3
2012-05-16 16:56:11 -07:00
3b088a2f36
Add missing includes.
...
Change-Id: Ic7199045d0cffb208871f52cc167194013351d32
2012-05-16 23:05:32 +09:00
9416c81403
Return the bigram frequency if available.
...
This concludes the work on bug#6313806.
Don't submit it before the dictionaries are suitably amended.
Bug: 6313806
Change-Id: Icfea45bd52bb9d8cc68ba2266f80640e3942bb7f
2012-05-16 21:14:06 +09:00
0028ed3627
Use "float" instead of "double"
...
Change-Id: I93ed4d88ede4058f081dd8d634b00dfff4e96d07
2012-05-16 20:45:05 +09:00
f837b57bf5
Merge "Reorder suggestions result according to auto correction threshold" into jb-dev
2012-05-16 04:13:08 -07:00
db1939dbaa
Reorder suggestions result according to auto correction threshold
...
Bug: 5413904
Change-Id: I3aa3a8109ba45d2129b58d8242866fd3dd3473cb
2012-05-16 19:58:48 +09:00
6804b8e0fd
Fix a bug of handling single quote in the correction algorithm
...
Bug: 6096247
Change-Id: I5490bbdee4ce1e3e0729ec1510a2baab85eeaf05
2012-05-15 15:12:55 +09:00
4d289d39ae
Contacts dictionary rebuilds only when contact names have changed.
...
Bug: 6396600
Change-Id: Iad693ec4bab6351793d624e5c5b0a9f5c12a60e3
2012-05-11 18:43:53 -07:00
49ba135fde
Perform the actual bigram frequency lookup.
...
This still returns the unigram frequency, because the values stored
for bigrams in the dictionary are not ready to be returned in-place
instead of unigram values. Aside from this, the code is complete.
Bug: 6313806
Change-Id: If7bb7b644730782277f0f6663334c170b7fe13fb
2012-05-10 20:01:44 +09:00
8950ce6c44
Replace the bigram list position with the map and filter
...
Passing the position will not allow us a reasonable lookup
time. Replace this with a map and bloom filter for very fast
lookup.
Bug: 6313806
Change-Id: I3a61c0001cbc987c1c3c7b8df635d4590a370144
2012-05-07 17:15:21 +09:00
f1634c872c
Fill in the bloom filter for bigram lookup.
...
Bug: 6313806
Change-Id: Ib79e14f6f8b241f053da6069c15f19c71084317e
2012-05-07 15:38:43 +09:00
1ff8dc47be
Fill up a map of bigram addresses for lookup.
...
We don't want to do a linear search on each terminal when there
may be 100+ bigrams for a given word because that would be
disastrous for performance. Also, we need to resolve each bigram
address anyway.
This change resolves the addresses at first and puts them in a
balanced tree so that lookup will be O(log(n)).
Bug: 6313806
Change-Id: Ibf088035870b9acb41e948f0ab7af4726f2cee24
2012-05-02 17:50:44 +09:00
351864b38a
Fetch and pass the bigram position on suggestions.
...
This is a cherry-pick of change I2d81742f
Bug: 6313806
Change-Id: Ic1190b7980d032bc11b57841bca040d980889b6b
2012-04-26 15:24:42 +09:00
4d9b202c40
Pass the bigram list position from the top level
...
The position itself is still a const int = 0 until we have the previous
word passed to the function. This basically does the plumbing.
Bug: 6313806
Change-Id: Ib58995f334fe93e3ff5704d7c79f332017f101ac
2012-04-24 16:47:09 +09:00
171d1809ff
Add methods to inverse compute the probability.
...
For now the probability is just returned with the same
value it had, but this is some ground work that needs to be
done anyway.
Bug: 6313806
Change-Id: I9bb8b96b294109771208ade558c9ad56932d2f8e
2012-04-24 09:40:44 +09:00
522a04ea5b
Pass words as int[] to the native code.
...
We need to get the bigrams during the call to getSuggestions for
bug#6313806. We already give an int[] to getSuggestions and we
wanted to get rid of char[]'s anyway because it doesn't work with
surrogate pairs, so here we go.
Bug: 6313806
Change-Id: I56ce99f1db6b3302cdf42f0527343bded837091e
2012-04-23 16:05:36 +09:00
a58ebc73ae
Fix typo of some methods' name
...
Also changes some methods' argument type from Locale to String.
Change-Id: Ib68b528a450dc68a01546483403230f76500bee4
2012-04-18 16:40:50 +09:00
fec6837ae1
Fix debug compilation + small cleanup
...
Change-Id: Ia89d84f62ba38dee05d25fbc94698e889cf27d2c
2012-04-17 17:33:25 +09:00
ee396df162
Fix a native crash
...
This was introduced by Ieb2e306a which failed to keep the return
behavior in case the word doesn't have a bigram.
Change-Id: I6d2f0b79d41c4335e94696690c8331e314961133
2012-04-17 16:57:42 +09:00
9c2a96aa6c
Preparatory refactoring
...
Split out getting the pointer to the bigrams to a separate
function. This is a preparative change to bug#6313806
Change-Id: Ieb2e306a1151cd95dc1a16793c8dc2f7fed8b654
2012-04-17 11:46:20 +09:00
3f675f7060
Fix a large native memory leak.
...
This leak was about 500k and would happen whenever a new binary
dictionary was opened/closed.
Bug: 6299535
Change-Id: I4fad5b4d9c556ca889f5ef62d9d083a2eff6346a
2012-04-16 16:48:53 +09:00
338d3ec725
Replace the flags in getSuggestions with a boolean.
...
Change-Id: I0ec44df1979cb1dc21017ea290d2151a2af0e7cd
Conflicts:
java/src/com/android/inputmethod/latin/Suggest.java
2012-04-06 19:34:48 +09:00
aa8df59914
Enable using the flags read from the binary file.
...
Change-Id: Ib420c3e174ccc1a80c4b6fd066de3b7a2b6fb290
2012-04-06 18:54:20 +09:00
cd274b1469
Save the flags in a member in the unigram dictionary.
...
Change-Id: Ic8fad9110db6b97f98ace27af0f347b4e69de8c8
2012-04-06 18:34:59 +09:00
e81ac8baa0
Add a method to get the flags from a binary dictionary.
...
This method is not used yet
Change-Id: Ic15d3d423aff2c83c712bc0aa56571d30755e663
2012-04-06 18:34:22 +09:00
5b0761e6a9
Remove write-only stuff
...
Change-Id: I5ac8ab64c77a298502b3d063ea70db9b4da41716
2012-04-06 17:52:18 +09:00
9a933a742d
Read shortcuts as strings in the dictionary.
...
This has no impact on performance.
Before:
(0) 9.61 (0.01%)
(1) 57514.58 (56.70%)
(2) 10.55 (0.01%)
(3) 10.79 (0.01%)
(4) 133.20 (0.13%)
(5) 43553.87 (42.94%)
(6) 10.03 (0.01%)
(20) 47.20 (0.05%)
Total 101431.47 (sum of others 101289.84)
After:
(0) 10.52 (0.01%)
(1) 56311.16 (56.66%)
(2) 13.40 (0.01%)
(3) 10.98 (0.01%)
(4) 136.72 (0.14%)
(5) 42707.92 (42.97%)
(6) 9.79 (0.01%)
(20) 51.35 (0.05%)
Total 99390.76 (sum of others 99251.84)
The difference is not significant with regard to measure imprecision
Change-Id: I2e4f1ef7a5e99082e67dd27f56cf4fc432bb48fa
2012-04-06 16:22:08 +09:00
3ef3e24a12
Move the "src" directory as a preparation for Ib4a47342 and I66f6c5b9
...
Change-Id: I3ab65059f6e356530484bfd0bba26a634a4cba65
2012-03-30 09:53:51 +09:00
Satoshi Kataoka
Ken Wakasa
Jean Chalard
Keisuke Kuroyanagi
Tom Ouyang
Jean-Baptiste Queru
Tadashi G. Takaoka