Skip to content
Browse files

Merged branches/lattice changes r12:13 into trunk.

git-svn-id: https://joshua.svn.sf.net/svnroot/joshua/trunk@14 0ae5e6b2-d358-4f09-a895-f82f13dd62a4
  • Loading branch information...
1 parent 474685d commit e7e2bce7f59b22191797b410418a29847c9280bf dowobeha committed Jul 28, 2008
Showing with 1,995 additions and 1,402 deletions.
  1. +503 −0 COPYING
  2. +1 −0 build.xml
  3. +17 −11 src/edu/jhu/joshua/corpus/Corpus.java
  4. +17 −11 src/edu/jhu/joshua/corpus/ParallelCorpus.java
  5. +17 −11 src/edu/jhu/joshua/corpus/SuffixArrayParallelCorpus.java
  6. +17 −11 src/edu/jhu/joshua/corpus/TranslationResultsSet.java
  7. +23 −9 src/edu/jhu/joshua/decoder/Decoder.java
  8. +20 −1 src/edu/jhu/joshua/decoder/Support.java
  9. +24 −13 src/edu/jhu/joshua/decoder/Symbol.java
  10. +22 −10 src/edu/jhu/joshua/decoder/chart_parser/Bin.java
  11. +29 −15 src/edu/jhu/joshua/decoder/chart_parser/Chart.java
  12. +23 −10 src/edu/jhu/joshua/decoder/chart_parser/DotChart.java
  13. +22 −8 src/edu/jhu/joshua/decoder/feature_function/Model.java
  14. +20 −1 src/edu/jhu/joshua/decoder/feature_function/language_model/LMClient.java
  15. +21 −5 src/edu/jhu/joshua/decoder/feature_function/language_model/LMClient_MultiServer.java
  16. +21 −6 src/edu/jhu/joshua/decoder/feature_function/language_model/LMClient_Single.java
  17. +21 −6 src/edu/jhu/joshua/decoder/feature_function/language_model/LMGrammar.java
  18. +369 −241 src/edu/jhu/joshua/decoder/feature_function/language_model/LMGrammar_JAVA.java
  19. +0 −666 src/edu/jhu/joshua/decoder/feature_function/language_model/LMGrammar_JAVA_GENERAL.java
  20. +21 −9 src/edu/jhu/joshua/decoder/feature_function/language_model/LMGrammar_REMOTE.java
  21. +21 −7 src/edu/jhu/joshua/decoder/feature_function/language_model/LMModel.java
  22. +22 −7 src/edu/jhu/joshua/decoder/feature_function/language_model/LMServer.java
  23. +22 −5 src/edu/jhu/joshua/decoder/feature_function/language_model/srilm/LMGrammar_SRILM.java
  24. +22 −6 src/edu/jhu/joshua/decoder/feature_function/translation_model/TMGrammar.java
  25. +23 −6 src/edu/jhu/joshua/decoder/feature_function/translation_model/TMGrammar_Disk.java
  26. +24 −12 src/edu/jhu/joshua/decoder/feature_function/translation_model/TMGrammar_Memory.java
  27. +21 −8 src/edu/jhu/joshua/decoder/hypergraph/DiskHyperGraph.java
  28. +23 −10 src/edu/jhu/joshua/decoder/hypergraph/HyperGraph.java
  29. +20 −7 src/edu/jhu/joshua/decoder/hypergraph/HyperGraphPruning.java
  30. +22 −6 src/edu/jhu/joshua/decoder/hypergraph/InsideOutside.java
  31. +26 −14 src/edu/jhu/joshua/decoder/hypergraph/KbestExtraction.java
  32. +1 −1 src/edu/jhu/joshua/lattice/Arc.java
  33. +1 −1 src/edu/jhu/joshua/lattice/Lattice.java
  34. +1 −1 src/edu/jhu/joshua/lattice/Node.java
  35. +24 −8 src/edu/jhu/lzfUtility/Alignment.java
  36. +22 −7 src/edu/jhu/lzfUtility/FileUtility.java
  37. +21 −5 src/edu/jhu/lzfUtility/ReorderRule.java
  38. +22 −5 src/edu/jhu/lzfUtility/SocketUtility.java
  39. +21 −6 src/edu/jhu/lzfUtility/Tree.java
  40. +21 −4 src/edu/jhu/phraseExtraction/HieroExtractor.java
  41. +21 −0 src/edu/jhu/phraseExtraction/HieroGrammarScorer_Hashtable.java
  42. +22 −7 src/edu/jhu/phraseExtraction/HieroGrammarScorer_Trie.java
  43. +21 −5 src/edu/jhu/phraseExtraction/RuleExtraction.java
  44. +17 −11 src/edu/jhu/util/Counts.java
  45. +17 −11 src/edu/jhu/util/FileUtil.java
  46. +17 −11 src/edu/jhu/util/ValueComparator.java
  47. +17 −11 src/edu/jhu/util/math/Probability.java
  48. +17 −11 src/edu/jhu/util/sentence/Alignment.java
  49. +17 −10 src/edu/jhu/util/sentence/Coordinate.java
  50. +17 −10 src/edu/jhu/util/sentence/Grid.java
  51. +17 −11 src/edu/jhu/util/sentence/Grids.java
  52. +17 −10 src/edu/jhu/util/sentence/MaskedGrid.java
  53. +17 −11 src/edu/jhu/util/sentence/Phrase.java
  54. +17 −10 src/edu/jhu/util/sentence/PhraseExtractor.java
  55. +17 −12 src/edu/jhu/util/sentence/Span.java
  56. +17 −11 src/edu/jhu/util/sentence/Vocabulary.java
  57. +17 −11 src/edu/jhu/util/sentence/Word.java
  58. +17 −11 src/edu/jhu/util/sentence/phrase_extraction/BoundingBox.java
  59. +17 −11 src/edu/jhu/util/sentence/phrase_extraction/Consistent.java
  60. +17 −11 src/edu/jhu/util/sentence/phrase_extraction/ConstrainedConsistent.java
  61. +17 −11 src/edu/jhu/util/suffix_array/CorpusArray.java
  62. +17 −11 src/edu/jhu/util/suffix_array/SuffixArray.java
  63. +17 −11 src/edu/jhu/util/suffix_array/SuffixArrayFactory.java
  64. +1 −1 test/edu/jhu/joshua/lattice/ArcTest.java
  65. +1 −1 test/edu/jhu/joshua/lattice/LatticeTest.java
  66. +1 −1 test/edu/jhu/joshua/lattice/NodeTest.java
View
503 COPYING
@@ -0,0 +1,503 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
View
1 build.xml
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<!-- Build file for Joshua. Last changed: $LastChangedDate$ -->
<project name="JHU Decoder" default="compile" basedir=".">
<property name="src" value="./src" />
View
28 src/edu/jhu/joshua/corpus/Corpus.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.corpus;
// Imports
@@ -10,18 +26,8 @@
*
* @author Chris Callison-Burch
* @since 7 February 2005
- *
- * The contents of this file are subject to the Linear B Community Research
- * License Version 1.0 (the "License"). You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.linearb.co.uk/developer/. Software distributed under the License
- * is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (c) 2005 Linear B Ltd. All rights reserved.
+ * @version $LastChangedDate$
*/
-
public interface Corpus {
//===============================================================
View
28 src/edu/jhu/joshua/corpus/ParallelCorpus.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.corpus;
// Imports
@@ -9,18 +25,8 @@
*
* @author Chris Callison-Burch
* @since 7 February 2005
- *
- * The contents of this file are subject to the Linear B Community Research
- * License Version 1.0 (the "License"). You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.linearb.co.uk/developer/. Software distributed under the License
- * is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (c) 2005 Linear B Ltd. All rights reserved.
+ * @version $LastChangedDate$
*/
-
public interface ParallelCorpus {
//===============================================================
View
28 src/edu/jhu/joshua/corpus/SuffixArrayParallelCorpus.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.corpus;
// Imports
@@ -14,17 +30,7 @@
* ParallelCorpus interface using suffix arrays.
*
* @author Chris Callison-Burch
- * @since 13 February 2005
- *
- * The contents of this file are subject to the Linear B Community Research
- * License Version 1.0 (the "License"). You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.linearb.co.uk/developer/. Software distributed under the License
- * is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (c) 2005 Linear B Ltd. All rights reserved.
+ * @since 13 February 2005@version $LastChangedDate$
*/
public class SuffixArrayParallelCorpus implements ParallelCorpus {
View
28 src/edu/jhu/joshua/corpus/TranslationResultsSet.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.corpus;
// Imports
@@ -16,18 +32,8 @@
*
* @author Chris Callison-Burch
* @since 14 February 2005
- *
- * The contents of this file are subject to the Linear B Community Research
- * License Version 1.0 (the "License"). You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.linearb.co.uk/developer/. Software distributed under the License
- * is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (c) 2005 Linear B Ltd. All rights reserved.
+ * @version $LastChangedDate$
*/
-
public class TranslationResultsSet {
//===============================================================
View
32 src/edu/jhu/joshua/decoder/Decoder.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder;
import java.io.BufferedReader;
@@ -11,7 +27,7 @@
import edu.jhu.joshua.decoder.feature_function.Model.PhraseModel;
import edu.jhu.joshua.decoder.feature_function.Model.WordPenalty;
import edu.jhu.joshua.decoder.feature_function.language_model.LMGrammar;
-import edu.jhu.joshua.decoder.feature_function.language_model.LMGrammar_JAVA_GENERAL;
+import edu.jhu.joshua.decoder.feature_function.language_model.LMGrammar_JAVA;
import edu.jhu.joshua.decoder.feature_function.language_model.LMGrammar_REMOTE;
import edu.jhu.joshua.decoder.feature_function.language_model.LMModel;
import edu.jhu.joshua.decoder.feature_function.language_model.srilm.LMGrammar_SRILM;
@@ -22,16 +38,14 @@
import edu.jhu.joshua.decoder.hypergraph.KbestExtraction;
import edu.jhu.lzfUtility.FileUtility;
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
-/*#################### Decoder class
+/**
* this class implements:
* (1) read config file, initialize, call the chart-parsing functions
* (2) parallel decoding
- * */
-
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
+ */
public class Decoder {
//input files
public static String lm_file;
@@ -364,7 +378,7 @@ public static void init_lm_grammar(){
p_lm = new LMGrammar_SRILM(g_lm_order);
}else{
//p_lm = new LMGrammar_JAVA(g_lm_order, lm_file, use_left_euqivalent_state);
- p_lm = new LMGrammar_JAVA_GENERAL(g_lm_order, use_left_euqivalent_state, use_right_euqivalent_state);
+ p_lm = new LMGrammar_JAVA(g_lm_order, use_left_euqivalent_state, use_right_euqivalent_state);
}
}
View
21 src/edu/jhu/joshua/decoder/Support.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder;
@@ -6,7 +22,10 @@
import java.util.HashMap;
import java.util.Iterator;
-
+/**
+ *
+ * @version $LastChangedDate$
+ */
public class Support {
public static int DEBUG=0;
public static int INFO=1;
View
37 src/edu/jhu/joshua/decoder/Symbol.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder;
import java.io.BufferedReader;
@@ -9,26 +25,21 @@
import edu.jhu.joshua.decoder.feature_function.translation_model.TMGrammar;
import edu.jhu.lzfUtility.FileUtility;
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
-/*this class implement
+/**
+ * this class implement
* (1) initialize the symbol table
* (2) provide conversion between symbol and integers
- */
-
-
-
-/*############# How to initialize the Symbol
+ *
+ * How to initialize the Symbol
* Having multiple LM modes complicate the class, we have four LM mode: JAVA_LM, SRILM, Distributed_LM, and NONE_LM. The NONE_LM and JAVA_LM will be treated as same.
*JAVA_LM and NONE_LM: call add_global_symbols(true) to initialize
*SRILM: the SRILM must first be initialized, then call add_global_symbols(false)
*DistributedLM (from decoder): call init_sym_tbl_from_file(true)
*DistributedLM (from LMServer): call init_sym_tbl_from_file(true/false)
- **/
-
-
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
+ */
public class Symbol {
//terminal symbol may get from a tbl file, srilm, or a lm file
View
32 src/edu/jhu/joshua/decoder/chart_parser/Bin.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder.chart_parser;
import java.util.ArrayList;
@@ -17,20 +33,16 @@
import edu.jhu.joshua.decoder.hypergraph.HyperGraph.Deduction;
import edu.jhu.joshua.decoder.hypergraph.HyperGraph.Item;
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
-/*#################### Bin class
+/**
* this class implement functions:
* (1) combine small itesm into larger ones using rules, and create items and hyper-edges to construct a hyper-graph,
* (2) evaluate model cost for items,
* (3) cube-pruning
- * */
-
-/* Note: Bin creates Items, but not all Items will be used in the hyper-graph
- * */
-
+ * Note: Bin creates Items, but not all Items will be used in the hyper-graph
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
+ */
public class Bin
{
/*we need always maintain the priority queue (worst first), so that we can do prunning effieciently
View
44 src/edu/jhu/joshua/decoder/chart_parser/Chart.java
@@ -1,4 +1,21 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder.chart_parser;
+
import java.util.ArrayList;
import java.util.HashMap;
@@ -16,30 +33,27 @@
import edu.jhu.joshua.decoder.hypergraph.HyperGraph;
import edu.jhu.joshua.decoder.hypergraph.HyperGraph.Item;
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
-/*#################### Chart class
+/**
+ * Chart class
* this class implements chart-parsing:
* (1) seeding the chart
* (2) cky main loop over bins,
* (3) identify applicable rules in each bin
- */
-
-/* Note: the combination operation will be done in Bin
- * */
-
-/*Signatures of class:
+ * Note: the combination operation will be done in Bin
+ *
+ * Signatures of class:
* Bin: i, j
* SuperItem (used for CKY check): i,j, lhs
* Item (or node): i,j, lhs, edge ngrams
- * Deduction (and node)*/
-
-/* index of sentences: start from zero
+ * Deduction (and node)
+ *
+ * index of sentences: start from zero
* index of cell: cell (i,j) represent span of words indexed [i,j-1] where i is in [0,n-1] and j is in [1,n]
- * */
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
+ */
public class Chart {
public TMGrammar[] l_grammars;
public DotChart[] l_dotcharts;//each grammar should have a dotchart associated with it
View
33 src/edu/jhu/joshua/decoder/chart_parser/DotChart.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder.chart_parser;
import java.util.ArrayList;
@@ -6,19 +22,16 @@
import edu.jhu.joshua.decoder.feature_function.translation_model.TMGrammar;
import edu.jhu.joshua.decoder.feature_function.translation_model.TMGrammar.TrieNode;
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
-//#################### DotChart class:
-/*This class implements:
+/**
+ * This class implements:
* (1) seeding
* (2) extend the dot by accessing the TM grammar, and create and remember DotItems
+ *
+ * Note: the purpose of this class: (1) do CKY parsing in an efficient way (i.e., identify the applicable rules fastly); (2) binarization on the fly; (3) remember the partial application of rules
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
*/
-
-/*Note: the purpose of this class: (1) do CKY parsing in an efficient way (i.e., identify the applicable rules fastly); (2) binarization on the fly; (3) remember the partial application of rules
-*/
-
public class DotChart
{
public Chart p_chart; //pointer the Chart that it associated with
View
30 src/edu/jhu/joshua/decoder/feature_function/Model.java
@@ -1,22 +1,36 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder.feature_function;
import java.util.ArrayList;
import java.util.HashMap;
import edu.jhu.joshua.decoder.Symbol;
-import edu.jhu.joshua.decoder.feature_function.translation_model.TMGrammar;
import edu.jhu.joshua.decoder.feature_function.translation_model.TMGrammar.Rule;
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
-/*this class implement
+/**
+ * This class implements
* (1) General model interfact
* (2) simple models: WordPenalty, PhraseModel, ArityPhrasePenalty, and PhraseModel
+ * provide ways to calculate cost based on rule and state information
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
*/
-
-/*provide ways to calculate cost based on rule and state information*/
public class Model {
boolean stateless=false; //rule cost can be calculated from rule alone, note: stateless==true implies that contextual==true
View
21 src/edu/jhu/joshua/decoder/feature_function/language_model/LMClient.java
@@ -1,9 +1,28 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder.feature_function.language_model;
import java.util.ArrayList;
-
+/**
+ *
+ * @version $LastChangedDate$
+ */
public abstract class LMClient {
public LMClient(){
View
26 src/edu/jhu/joshua/decoder/feature_function/language_model/LMClient_MultiServer.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder.feature_function.language_model;
import java.util.ArrayList;
@@ -6,14 +22,14 @@
import edu.jhu.joshua.decoder.Support;
import edu.jhu.lzfUtility.SocketUtility;
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-/*this class implement
+/**
+ * this class implement
* (1) The client side when using multiple LMServers
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
*/
-
public class LMClient_MultiServer extends LMClient{
public static SocketUtility.ClientConnection[] l_clients=null;
public static double[] probs=null;
View
27 src/edu/jhu/joshua/decoder/feature_function/language_model/LMClient_Single.java
@@ -1,9 +1,21 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder.feature_function.language_model;
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
import java.util.ArrayList;
import java.util.HashMap;
import java.io.IOException;
@@ -13,10 +25,13 @@
import edu.jhu.lzfUtility.SocketUtility;
-/*this class implement
+/**
+ * this class implement
* (1) The client side when using only one LMServer
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
*/
-
public class LMClient_Single extends LMClient {
SocketUtility.ClientConnection p_client;
HashMap request_cache = new HashMap();
View
27 src/edu/jhu/joshua/decoder/feature_function/language_model/LMGrammar.java
@@ -1,3 +1,19 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder.feature_function.language_model;
import java.util.ArrayList;
@@ -6,14 +22,13 @@
import edu.jhu.joshua.decoder.Support;
import edu.jhu.joshua.decoder.Symbol;
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
-/*this class implement
+/**
+ * this class implement
* (1) LMGrammar interface
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
*/
-
public abstract class LMGrammar {
protected int g_order=3;
protected long start_loading_time;
View
610 src/edu/jhu/joshua/decoder/feature_function/language_model/LMGrammar_JAVA.java
@@ -1,44 +1,89 @@
+/* This file is part of the Joshua Machine Translation System.
+ *
+ * Joshua is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package edu.jhu.joshua.decoder.feature_function.language_model;
import java.io.BufferedReader;
-import java.util.ArrayList;
+import java.util.HashMap;
import edu.jhu.joshua.decoder.Decoder;
import edu.jhu.joshua.decoder.Support;
import edu.jhu.joshua.decoder.Symbol;
import edu.jhu.lzfUtility.FileUtility;
-/*!!!!!!!!!!!!!!!!!!!!! replaced by LMGrammar_JAVA_General*/
-
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
-//############################## not used class
-
+/**
+ * this class implement
+ * (1) read the LM file into a Trie data structure
+ * (2) get LM probablity for a given n-grm
+ * (3) get equivilent state
+ *
+ * @author Zhifei Li, <zhifei.work@gmail.com>
+ * @version $LastChangedDate$
+ */
public class LMGrammar_JAVA extends LMGrammar {
/*a backoff node is a hashtable, it may include:
- * (1) probability for next words
- * (2) pointer to a next-layer backoff node (hashtable)
+ * (1) probabilititis for next words
+ * (2) pointers to a next-layer backoff node (hashtable)
* (3) backoff weight for this node
- * (4) suffix flat to indicate that there is ngrams start from this suffix
+ * (4) suffix/prefix flag to indicate that there is ngrams start from this suffix
*/
-
private LMHash root=null;
private int g_n_bow_nodes=0;
private int g_n_suffix_nodes=0;
- //private double LOGZERO=-999.0;
+ static private float MIN_LOG_P= -9999.0f; //ngram prob must be smaller than this number
+ static private double SUFFIX_ONLY= MIN_LOG_P*3; //ngram prob must be smaller than this number
+
private double NON_EXIST_WEIGHT=0;//the history has not appeared at all
private int num_rule_read=0;
-
boolean g_is_add_prefix_infor=false;
- boolean g_is_add_suffix_infor=false;
+ boolean g_is_add_suffix_infor=false;
+
+ HashMap request_cache_prob = new HashMap();//cmd with result
+ HashMap request_cache_backoff = new HashMap();//cmd with result
+ HashMap request_cache_left_equiv = new HashMap();//cmd with result
+ HashMap request_cache_right_equiv = new HashMap();//cmd with result
+ int cache_size_limit= 250000;
+
- public LMGrammar_JAVA(int order, String grammar_file, boolean is_add_suffix_infor){
- super(order);
- System.out.println("use java lm");
+ public LMGrammar_JAVA(int order, boolean is_add_suffix_infor, boolean is_add_prefix_infor){
+ super(order);
+ System.out.println("use java lm");
+ g_is_add_prefix_infor = is_add_prefix_infor;
g_is_add_suffix_infor = is_add_suffix_infor;
Symbol.add_global_symbols(true);
+ /*//debug
+ LMHash[] t_arrays = new LMHash[10000000];
+ System.out.println("##### mem used (kb): " + Support.getMemoryUse());
+ System.out.println("##### time used (seconds): " + (System.currentTimeMillis()-start_loading_time)/1000);
+ for(int i=0; i<10000000;i++){
+ LMHash t_h = new LMHash(5);
+ double j=0.1f;
+ t_h.put(i, j);
+
+ //System.out.println("ele is " + t_h.get(i));
+ t_arrays[i]=t_h;
+ if(i%1000000==0){
+ System.out.println(i +" ##### mem used (kb): " + Support.getMemoryUse());
+ System.out.println("##### time used (seconds): " + (System.currentTimeMillis()-start_loading_time)/1000);
+ }
+ }
+ System.exit(0);
+ //end*/
+
+
/*//debug
double[] bow = new double[1];
int[] backoff_history = new int[1];
@@ -55,40 +100,86 @@ public void write_vocab_map_srilm(String fname){
System.out.println("Error: call write_vocab_map_srilm in java, must exit");
System.exit(0);
}
+
+
+ // signature of this item: i, j, lhs, states (in fact, we do not need i, j)
+ private String get_signature(int[] words){
+ StringBuffer res = new StringBuffer(words.length);
+ for(int i=0; i<words.length; i++){
+ res.append(" ");
+ res.append(words[i]);
+ }
+ return res.toString();
+ }
+
+ /*note: the mismatch between srilm and our java implemtation is in: when unk words used as context, in java it will be replaced with "<unk>", but srilm will not, therefore the
+ *lm cost by srilm may be smaller than by java, this happens only when the LM file have "<unk>" in backoff state*/
//note: we never use check_bad_stuff here
protected double get_prob_specific(int[] ngram_wrds_in, int order, boolean check_bad_stuff){
+ Double res;
+ //cache
+ //String sig = get_signature(ngram_wrds_in);
+ //res = (Double)request_cache_prob.get(sig);
+ //if(res!=null)return res;
+
int[] ngram_wrds=replace_with_unk(ngram_wrds_in);//TODO
- if(ngram_wrds[ngram_wrds.length-1]==Symbol.UNK_SYM_ID)//TODO: wrong implementation in hiero
- return -Decoder.lm_ceiling_cost;
- //TODO: untranslated words
- if(root==null){
- System.out.println("root is null");
- System.exit(0);
- }
- int last_word_id = ngram_wrds[ngram_wrds.length-1];
- LMHash pos =root;
- Double prob=(Double)root.get(last_word_id);
- double bow_sum=0;
- for(int i=ngram_wrds.length-2; i>=0; i--){//reverse search, start from the second-last word
- LMHash next_layer=(LMHash) pos.get(ngram_wrds[i]+Symbol.lm_end_sym_id);
- if(next_layer!=null){//have context/bow node
- pos=next_layer;
- Double prob2=(Double)pos.get(last_word_id);
- if(prob2!=null){//reset, if backoff, will at least back off to here
- prob=prob2;
- bow_sum =0;
- }else{
- Double bow = (Double) pos.get( Symbol.BACKOFF_WGHT_SYM_ID );
- if(bow!=null)
- bow_sum += bow;
+ if(ngram_wrds[ngram_wrds.length-1]==Symbol.UNK_SYM_ID){//TODO: wrong implementation in hiero
+ res= -Decoder.lm_ceiling_cost;
+ }else{
+ //TODO: untranslated words
+ if(root==null){
+ System.out.println("root is null");
+ System.exit(0);
+ }
+ int last_word_id = ngram_wrds[ngram_wrds.length-1];
+ LMHash pos =root;
+ //Double prob=(Double)pos.get(last_word_id);
+ Double prob=get_valid_prob(pos,last_word_id);
+ double bow_sum=0;
+ for(int i=ngram_wrds.length-2; i>=0; i--){//reverse search, start from the second-last word
+ LMHash next_layer=(LMHash) pos.get(ngram_wrds[i]+Symbol.lm_end_sym_id);
+ if(next_layer!=null){//have context/bow node
+ pos=next_layer;
+ //Double prob2=(Double)pos.get(last_word_id);
+ Double prob2=get_valid_prob(pos,last_word_id);
+ if(prob2!=null){//reset, if backoff, will at least back off to here
+ prob=prob2;
+ bow_sum =0;
+ }else{
+ Double bow = (Double) pos.get( Symbol.BACKOFF_WGHT_SYM_ID );
+ if(bow!=null)
+ bow_sum += bow;
+ }
+ }else{//do not have context/bow node
+ break;
}
- }else{//do not have context/bow node
- break;
}
+ res = prob + bow_sum;
}
- return prob + bow_sum;
+ //cache
+ //if(request_cache_prob.size()>cache_size_limit)
+ // request_cache_prob.clear();
+ //request_cache_prob.put(sig, res);
+
+ return res;
+ }
+
+ private Double get_valid_prob(LMHash pos, int wrd){
+ Double res= (Double)pos.get(wrd);
+ if(g_is_add_suffix_infor==false)
+ return res;
+
+ if(res!=null){
+ if(res==SUFFIX_ONLY)
+ return null;
+ if(res>MIN_LOG_P)//logP without suffix flag
+ return res;
+ else//logP with suffix flag
+ return res-MIN_LOG_P;
+ }
+ return null;
}
// ##################### begin right equivalent state #############
@@ -103,190 +194,165 @@ protected double get_prob_specific(int[] ngram_wrds_in, int order, boolean check
//the returned array lenght must be the same the len of original_state
//the only change to the original_state is: replace with more non-null state words to null state
- public int[] get_right_equi_state(int[] original_state_in, int order, boolean check_bad_stuff){
- if(Decoder.use_right_euqivalent_state==false)
+ //O(n^2)
+ public int[] get_right_equi_state(int[] original_state_in, int order, boolean check_bad_stuff){
+ if(Decoder.use_right_euqivalent_state==false || original_state_in.length!=g_order-1)
return original_state_in;
- int[] original_state=replace_with_unk(original_state_in);
+ int[] res;
+ //cache
+ String sig = get_signature(original_state_in);
+ res = (int[])request_cache_right_equiv.get(sig);
+ if(res!=null) {
+ //System.out.println("right cache hit");
+ return res;
+ }
- int[] res = new int[original_state.length];
- LMHash pos =root;
- /*if there is null words, it will be automatically ok*/
- for(int i=original_state.length-1; i>=0; i--){//reverse search
- int cur_wrd = original_state[i];
-
- LMHash next_layer=(LMHash) pos.get(cur_wrd+Symbol.lm_end_sym_id);
- //can deal with: a lower-order ngram does not have a backoff weight (but have prob in lm), but its higher-order ngram has a bow
- if(next_layer!=null && (Double)next_layer.get(Symbol.BACKOFF_WGHT_SYM_ID)!=null){//TODO: we also need to make sure that next_layer.tbl_info contains prob (next_layer.tbl_info may not have a prob because the lm file have certain high-order ngram, but not have its sub-low-ngram)
- res[i] = cur_wrd;
- pos=next_layer;
- }else{//do not have a backoff weight
- for(int j=i; j>=0;j--)
- res[j] = Symbol.NULL_RIGHT_LM_STATE_SYM_ID;
+ int[] original_state=replace_with_unk(original_state_in);//we do not put this statement at the beging to match the SRILM condition (who does not have replace_with_unk)
+ res = new int[original_state.length];
+ for(int i=1; i<=original_state.length; i++){//forward search
+ int[] cur_wrds = Support.sub_int_array(original_state, i-1, original_state.length);
+ if(have_prefix(cur_wrds)==false){
+ res[i-1]=Symbol.NULL_RIGHT_LM_STATE_SYM_ID;
+ }else{
+ for(int j=i; j<=original_state.length; j++)
+ res[j-1] = original_state[j-1];
break;
}
}
+ //cache
+ if(request_cache_right_equiv.size()>cache_size_limit)
+ request_cache_right_equiv.clear();
+ request_cache_right_equiv.put(sig, res);
+
//System.out.println("right org state: " + Symbol.get_string(original_state) +"; equiv state: " + Symbol.get_string(res));
return res;
- }
+ }
+
+ //O(n)
+ private boolean have_prefix(int[] words){
+ LMHash pos=root;
+ int i=words.length-1;
+ for( ; i>=0; i--){//reverse search
+ LMHash next_layer=(LMHash) pos.get(words[i]+Symbol.lm_end_sym_id);
+ if(next_layer!=null){
+ pos=next_layer;
+ }else{
+ break;
+ }
+ }
+ if(i==-1 && pos.containsKey(Symbol.LM_HAVE_PREFIX_SYM_ID))
+ return true;
+ else
+ return false;
+ }
+
// ##################### end right equivalent state #############
//############################ begin left equivalent state ##############################
+
/*several observation:
* In general:
* (1) In general, there might be more than one <bo> or <null>, and they can be in any position
* (2) in general, whenever there is a <bo> or <null> in a given ngram, then it will definitely backoff since it has same/more context
*/
//return: (1) the equivlant state vector; (2) the finalized cost; (3) the estimated cost
- public int[] get_left_equi_state(int[] original_state_wrds_in, int order, double[] cost){
- if(Decoder.use_left_euqivalent_state==false){
+// O(n^2)
+ public int[] get_left_equi_state(int[] original_state_wrds_in, int order, double[] cost){
+ if(Decoder.use_left_euqivalent_state==false){
return original_state_wrds_in;
- }
- //sanity check
- if(original_state_wrds_in.length> order-1){
- System.out.println("ngram state is greather than the max order-1");
- System.exit(0);
- }
- int[] original_state_wrds = replace_with_unk(original_state_wrds_in);//???
+ }
+ int[] original_state_wrds = replace_with_unk(original_state_wrds_in);//we do not put this statement at the beging to match the SRILM condition (who does not have replace_with_unk)
+
+ //## deal with case overlap state
+ if(original_state_wrds.length<g_order-1){
+ for(int i=0; i<original_state_wrds.length; i++){
+ int[] cur_wrds = Support.sub_int_array(original_state_wrds, 0, i+1);
+ cost[1] += -get_prob(cur_wrds, cur_wrds.length, false);//est cost;
+ }
+ return original_state_wrds;
+ }
+
+ //## non-overlaping state
int[] res_equi_state = new int[original_state_wrds.length];
double res_final_cost = 0.0;//finalized cost
- double res_est_cost=0.0;//estimated cost
- boolean check_suffix=true;
- for(int i=0; i<original_state_wrds.length; i++){//from left to right
- int[] cur_suffix = Support.sub_int_array(original_state_wrds, 0, i+1);
- double[] t_cost = new double[2];
- int res_state = get_left_equi_state_ngram(cur_suffix,t_cost,check_suffix);
- if(res_state==Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID || res_state==Symbol.NULL_LEFT_LM_STATE_SYM_ID)
- check_suffix=false;
- res_equi_state[i]=res_state;
- res_final_cost += t_cost[0];
- res_est_cost += t_cost[1];
- }
+ double res_est_cost=0.0;//estimated cost
+ for(int i=original_state_wrds.length; i>0; i--){//BACKWORD search
+ int[] cur_wrds = Support.sub_int_array(original_state_wrds, 0, i);
+ if(have_suffix(cur_wrds)==false){
+ int last_wrd = cur_wrds[i-1];
+ if(last_wrd==Symbol.UNK_SYM_ID){
+ res_equi_state[i-1] = last_wrd;
+ res_est_cost += -get_prob(cur_wrds, cur_wrds.length, false);//est cost
+ }else{
+ if(last_wrd!=Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID )
+ res_final_cost += -get_prob(cur_wrds, cur_wrds.length, false);
+
+ res_equi_state[i-1]=Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID;
+ /*//TODO: for simplicity, we may just need BACKOFF_LEFT_LM_STATE_SYM_ID??
+ int[] backoff_history = Support.sub_int_array(cur_wrds, 0, cur_wrds.length-1);//ignore last wrd
+ double[] bow = new double[1];
+ boolean finalized_backoff = check_backoff_weight(backoff_history, bow, 0);//backoff weight is already added outside this function?
+ if(finalized_backoff==true){
+ res_equi_state[i-1]=Symbol.NULL_LEFT_LM_STATE_SYM_ID;//no state, no bow, no est_cost
+ }else{
+ res_equi_state[i-1]=Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID;
+ }*/
+ }
+ }else{//have suffix
+ for(int j=i; j>0; j--){
+ res_equi_state[j-1] = original_state_wrds[j-1];
+ cur_wrds = Support.sub_int_array(original_state_wrds, 0, j);
+ res_est_cost += -get_prob(cur_wrds, cur_wrds.length, false);//est cost;
+ }
+ break;
+ }
+ }
cost[0]=res_final_cost;
cost[1]=res_est_cost;
//System.out.println("left org state: "+ Symbol.get_string(original_state_wrds) + "; euqiv state: " + Symbol.get_string(res_equi_state) + " final: " +res_final_cost + "; estcost: " +res_est_cost );
return res_equi_state;
}
- //return: res_state, cost[0](additional final cost), cost[1](estimateion cost)
- private int get_left_equi_state_ngram(int[] cur_suffix, double[] cost, boolean should_check_suffix){
- int last_wrd = cur_suffix[cur_suffix.length-1];
- int res_state;
- if(last_wrd == Symbol.NULL_LEFT_LM_STATE_SYM_ID){
- res_state=Symbol.NULL_LEFT_LM_STATE_SYM_ID;//no state, no bow, no est_cost
- }else if(last_wrd == Symbol.UNK_SYM_ID){
-// note: the <unk> may be needed to calculate probablity of: <unk> *
- /*res_state=Symbol.NULL_LEFT_LM_STATE_SYM_ID;//no state, no bow, no est_cost
- cost[0] += -get_prob(cur_suffix, cur_suffix.length, false);*/
- res_state = last_wrd;
- cost[1] += -get_prob(cur_suffix, cur_suffix.length, false);//est cost
- }else if(last_wrd == Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID){//new backoff weight is already added outside this function?
- if(should_check_suffix==false){//means should always backoff, and backoff weights are finalized
- res_state=Symbol.NULL_LEFT_LM_STATE_SYM_ID;//no state, no bow, no est_cost, //backoff weight is already added outside this function?
- }else if(cur_suffix.length==1){//first word
- res_state = Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID;
- cost[1] += 0;//-get_prob(cur_suffix, cur_suffix.length, false);//TODO: est unk
- }else{
- int[] backoff_history = Support.sub_int_array(cur_suffix, 0, cur_suffix.length-1);//ignore last wrd
- double[] bow = new double[1];
- boolean finalized_backoff = check_backoff_weight(backoff_history, bow, 0);//backoff weight is already added outside this function?
- if(finalized_backoff==true){
- res_state=Symbol.NULL_LEFT_LM_STATE_SYM_ID;//no state, no bow, no est_cost
- }else{
- res_state=Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID;
- cost[1] += 0;//-get_prob(cur_suffix, cur_suffix.length, false);//TODO: est unk
- }
- }
- }else{//regular word
- if(should_check_suffix==false){//means should always backoff, and backoff weights are zero
- res_state=Symbol.NULL_LEFT_LM_STATE_SYM_ID;//no state, no bow, no est_cost
- cost[0] += -get_prob(cur_suffix, cur_suffix.length, false);//just need the last two words
- }else{
- int[] backoff_ngram = backoff_ngram_with_suffix(cur_suffix);
- if(backoff_ngram==null){//should not backoff
- res_state = last_wrd;
- cost[1] += -get_prob(cur_suffix, cur_suffix.length, false);//est cost
- }else{//backoff
- /*for a suffix, if there is no ngram (excluding the suffix itself) ending with this suffix, it does not mean the suffix ngram itself will be always backoff
- * that is why we cannot split the prob into two parts*/
- //double cur_prob = get_prob(backoff_ngram, backoff_ngram.length, false);//we cannot split the prob
- double cur_prob = get_prob(cur_suffix, cur_suffix.length, false);//instead of backoff_ngram, use cur_suffix here
- cost[0] += -cur_prob;
- if(cur_suffix.length==1){//first word
- res_state = Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID;
- cost[1] += 0;//-cur_prob*(g_order-cur_suffix.length)/g_order;//TODO: in fact, we want to estimate remaining bow weights
- }else{
- /*est_cost: think about the case without using equiv state, in which case we will use cur_prob as est cost
- * in current case, since the cur_prob is in final cost, we should use zero as est cost*/
- int[] backoff_history = Support.sub_int_array(cur_suffix, 0, cur_suffix.length-1);//ignore last wrd
- double[] bow = new double[1];
- boolean finalized_backoff = check_backoff_weight(backoff_history, bow, cur_suffix.length-backoff_ngram.length);
- if(finalized_backoff==true){//no backoff weight for backoff_history, //no estimation required
- res_state=Symbol.NULL_LEFT_LM_STATE_SYM_ID;//do not need to have this wrd as state
- //cost[0] += -bow[0];//addtional final cost, already counted in: cur_prob = get_prob(cur_suffix, cur_suffix.length, false);
- }else{
- res_state=Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID;
- //cost[0] += -bow[0];//addtional final cost, but still need to calculate some high-order backoff weight in the future, already counted in: cur_prob = get_prob(cur_suffix, cur_suffix.length, false);
- //cost[1] += -( get_prob(cur_suffix, cur_suffix.length,false)- cur_prob- bow[0]);//TODO: use get_prob_euqi_state?
- cost[1] += 0;//-cur_prob*(g_order-cur_suffix.length)/g_order;//TODO: in fact, we want to estimate remaining bow weights
- }
- }
- }
- }
+
+
+ private boolean have_suffix(int[] words){
+ LMHash pos=root;
+ for(int i=words.length-2; i>=0; i--){//reverse search, start from the second-last word
+ LMHash next_layer=(LMHash) pos.get(words[i]+Symbol.lm_end_sym_id);
+ if(next_layer!=null){
+ pos=next_layer;
+ }else{
+ return false;
+ }
}
- return res_state;
+ int last_word_id = words[words.length-1];
+ Double prob=(Double)pos.get(last_word_id);
+ if(prob!=null && prob<=MIN_LOG_P)
+ return true;
+ else
+ return false;
}
-
-
-
- private int[] backoff_ngram_with_suffix(int[] suffix){//must: suffix.size()<g_order
- if(root==null){
- System.out.println("root is null");
- System.exit(0);
- }
- ArrayList res= new ArrayList();
- LMHash pos = root;
-
- for(int i=suffix.length; i>=1; i--){//reverse search
- int cur_wrd =suffix[i-1];
- LMHash next_layer=(LMHash) pos.get(cur_wrd+Symbol.lm_end_sym_id);
- //we assume that the existence of suffix implies the existence of ngram prob for the suffix in the lm file
- if(next_layer!=null && next_layer.containsKey(Symbol.LM_HAVE_SUFFIX_SYM_ID)==true){
- //TODO: we also need to make sure that next_layer.tbl_info contains prob (next_layer.tbl_info may not have a prob because the lm file have certain high-order ngram, but not have its sub-low-ngram)
- pos=next_layer;
- res.add(0,cur_wrd);
- }else{
- break;
- }
- }
- if(res.size()==suffix.length)//have ngram end with this suffix
- return null;
- else{
- return Support.sub_int_array(res, 0, res.size());
- }
- }
+
- protected double get_prob_backoff_state_specific(int[] ngram_wrds, int order, int n_additional_bow){
+ protected double get_prob_backoff_state_specific(int[] ngram_wrds, int order, int n_additional_bow){
int[] backoff_wrds = Support.sub_int_array(ngram_wrds, 0, ngram_wrds.length-1);
double[] sum_bow =new double[1];
check_backoff_weight(backoff_wrds, sum_bow, n_additional_bow);
return sum_bow[0];
}
-
- //num_backoff: for a given history, h(1)...h(n-1), the longest will be first used, followed by shorter one, until the number of times is reached
- //however, the search is reverse: first get short one, then longer one
- protected double get_backoff_weight_sum(int[] backoff_wrds, int req_num_backoff){
- double[] sum_bow =new double[1];
- check_backoff_weight(backoff_wrds, sum_bow, req_num_backoff);
- return sum_bow[0];
- }
+
+
//if exist backoff weight for backoff_words, then return the accumated backoff weight
// if there is no backoff weight for backoff_words, then, we can return the finalized backoff weight
- private boolean check_backoff_weight(int[] backoff_words, double[] sum_bow, int num_backoff){
+ private boolean check_backoff_weight(int[] backoff_words, double[] sum_bow, int num_backoff){
+ if(backoff_words.length<=0)
+ return false;
+
double sum=0;
LMHash pos =root;
int start_use_i = num_backoff-1;//the start index that backoff should be applied
@@ -315,10 +381,8 @@ private boolean check_backoff_weight(int[] backoff_words, double[] sum_bow, int
// ######################################## general helper function ###########################################
protected int replace_with_unk(int in){
if(root.containsKey(in)==true ||
- in == Symbol.NULL_RIGHT_LM_STATE_SYM_ID || //root must have
- in == Symbol.NULL_LEFT_LM_STATE_SYM_ID ||
- in == Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID ||
- in == Symbol.LM_STATE_OVERLAP_SYM_ID)
+ in == Symbol.NULL_RIGHT_LM_STATE_SYM_ID ||
+ in == Symbol.BACKOFF_LEFT_LM_STATE_SYM_ID)
return in;
else
return Symbol.UNK_SYM_ID;
@@ -338,7 +402,7 @@ public void read_lm_grammar_from_file(String grammar_file){
start_loading_time = System.currentTimeMillis();
root = new LMHash();
root.put(Symbol.BACKOFF_WGHT_SYM_ID, NON_EXIST_WEIGHT);
-
+
BufferedReader t_reader_tree = FileUtility.getReadFileStream(grammar_file,"utf8");
Support.write_log_line("Reading grammar from file " + grammar_file, Support.INFO);
String line;
@@ -359,7 +423,7 @@ public void read_lm_grammar_from_file(String grammar_file){
continue; //skip this line
}
if(start==true)
- add_rule(line,order, g_is_add_suffix_infor);
+ add_rule(line,order, g_is_add_suffix_infor, g_is_add_prefix_infor);
}
System.out.println("# of bow nodes: " + g_n_bow_nodes + " ; # of suffix nodes: " + g_n_suffix_nodes);
@@ -368,87 +432,151 @@ public void read_lm_grammar_from_file(String grammar_file){
System.out.println("##### time used (seconds): " + (System.currentTimeMillis()-start_loading_time)/1000);
}
- /*all prefix information is in the backoff nodes
- *all suffix information is in the suffix nodes
- * */
- private void add_rule(String line, int order, boolean is_add_suffix_infor){//format: prob \t ngram \t backoff-weight
+
+ private void add_rule(String line, int order, boolean is_add_suffix_infor, boolean is_add_prefix_infor){//format: prob \t ngram \t backoff-weight
num_rule_read++;
if(num_rule_read%1000000==0){
System.out.println("read rules " + num_rule_read);
+ //System.out.println("##### mem used (kb): " + Support.getMemoryUse());
+ System.out.println("##### time used (seconds): " + (System.currentTimeMillis()-start_loading_time)/1000);
}
String[] wrds = line.trim().split("\\s+");
+
if(wrds.length<order+1 || wrds.length>order+2){//TODO: error
//Support.write_log_line("wrong line: "+ line, Support.ERROR);
return;
- }
+ }
+ int last_word_id = Symbol.add_terminal_symbol(wrds[order]);
- //### identify the position, and insert the backoff node if necessary
+ //##### identify the BOW position, insert the backoff node if necessary, and add suffix information
LMHash pos =root;
for(int i=order-1; i>0; i--){//reverse search, start from the second-last word
+ if(is_add_suffix_infor==true){
+ Double t_prob = (Double) pos.get(last_word_id);
+ if(t_prob!=null){
+ if(t_prob>MIN_LOG_P){//have prob, but not suffix flag
+ double tem = t_prob+MIN_LOG_P;
+ pos.put(last_word_id, tem);//overwrite
+ }
+ }else{
+ pos.put(last_word_id, SUFFIX_ONLY);
+ }
+ }
int cur_sym_id = Symbol.add_terminal_symbol(wrds[i]);
LMHash next_layer=(LMHash) pos.get(cur_sym_id+Symbol.lm_end_sym_id);
if(next_layer!=null){
pos=next_layer;
}else{
- LMHash new_tnode = new LMHash();//create new bow node
+ LMHash new_tnode = new LMHash();//create new bow node
+ pos.put(cur_sym_id+Symbol.lm_end_sym_id, new_tnode);
+ pos = new_tnode;
+
g_n_bow_nodes++;
if(g_n_bow_nodes%1000000==0){
System.out.println("add LMHash " + g_n_bow_nodes);
- System.out.println("##### mem used (kb): " + Support.getMemoryUse());
+ //System.out.println("##### mem used (kb): " + Support.getMemoryUse());
System.out.println("##### time used (seconds): " + (System.currentTimeMillis()-start_loading_time)/1000);
- }
- pos.put(cur_sym_id+Symbol.lm_end_sym_id, new_tnode);
- pos = new_tnode;
+ }
}
if (pos.containsKey(Symbol.BACKOFF_WGHT_SYM_ID)==false)
- pos.put(Symbol.BACKOFF_WGHT_SYM_ID, NON_EXIST_WEIGHT);//indicate it is a backoof node, to distinguish from a pure suffix node
+ pos.put(Symbol.BACKOFF_WGHT_SYM_ID, NON_EXIST_WEIGHT);//indicate it is a backoof node, to distinguish from a pure prefix node
}
- //### add probability
- int last_word_id = Symbol.add_terminal_symbol(wrds[order]);
- pos.put(last_word_id, new Double(wrds[0]));//add probability
+ //##### add probability
+ if(is_add_suffix_infor==true && pos.containsKey(last_word_id)){
+ double tem=(new Double(wrds[0])).doubleValue() + MIN_LOG_P;
+ pos.put(last_word_id, tem);//add probability and suffix flag
+ }else
+ pos.put(last_word_id, (new Double(wrds[0])).doubleValue());//add probability
+
+ //##### add prefix infor, a prefix node is just like a BOW node
+ if(is_add_prefix_infor==true){
+ pos.put(Symbol.LM_HAVE_PREFIX_SYM_ID, 1);//for preifx [1,order-1]
+ for(int i=1; i<order-1; i++){//ignore the last prefix
+ pos=root;//reset pos
+ for(int j=i; j>=1; j--){//reverse search: [1,i]
+ int cur_sym_id = Symbol.add_terminal_symbol(wrds[j]);
+ LMHash next_layer=(LMHash) pos.get(cur_sym_id+Symbol.lm_end_sym_id);
+ if(next_layer!=null){
+ pos=next_layer;
+ }else{
+ LMHash new_tnode = new LMHash();//create new prefix node
+ pos.put(cur_sym_id+Symbol.lm_end_sym_id, new_tnode);
+ pos = new_tnode;
+
+ g_n_bow_nodes++;
+ if(g_n_bow_nodes%1000000==0){
+ System.out.println("add LMHash " + g_n_bow_nodes);
+ //System.out.println("##### mem used (kb): " + Support.getMemoryUse());
+ System.out.println("##### time used (seconds): " + (System.currentTimeMillis()-start_loading_time)/1000);
+ }
+ }
+ }
+ pos.put(Symbol.LM_HAVE_PREFIX_SYM_ID, 1);//only the last node should have this flag
+ }
+ }
- //### add bow, and suffix information if necessary
- if( wrds.length==order+2 || //have bow weight to add
- is_add_suffix_infor==true){
+ //##### add bow
+ if( wrds.length==order+2){ //have bow weight to add
pos=root;
- int stop_id= (wrds.length==order+2) ? 1 : 2;//if only for suffix infor, then ignore the first word
- for(int i=order; i>=stop_id; i--){//reverse search, start from the last word
+ for(int i=order; i>=1; i--){//reverse search, start from the last word
int cur_sym_id = Symbol.add_terminal_symbol(wrds[i]);
LMHash next_layer=(LMHash) pos.get(cur_sym_id+Symbol.lm_end_sym_id);
if(next_layer!=null){
pos=next_layer;
}else{
- LMHash new_tnode = new LMHash();//create new suffix node
+ LMHash new_tnode = new LMHash();//create new bow node
+ pos.put(cur_sym_id+Symbol.lm_end_sym_id, new_tnode);
+ pos = new_tnode;
+
g_n_bow_nodes++;
if(g_n_bow_nodes%1000000==0){
System.out.println("add LMHash " + g_n_bow_nodes);
- System.out.println("##### mem used (kb): " + Support.getMemoryUse());
+ //System.out.println("##### mem used (kb): " + Support.getMemoryUse());
System.out.println("##### time used (seconds): " + (System.currentTimeMillis()-start_loading_time)/1000);
}
- pos.put(cur_sym_id+Symbol.lm_end_sym_id, new_tnode);
- pos = new_tnode;
- }
- if(is_add_suffix_infor==true && i>1)
- pos.put(Symbol.LM_HAVE_SUFFIX_SYM_ID, 1);
+ }
- //add bow weight here
- if(wrds.length==order+2 ){ //have bow weight to add
- if(i==1){//force to override the backoff weight
- Double backoff_weight = new Double(wrds[order+1]);
- pos.put(Symbol.BACKOFF_WGHT_SYM_ID, backoff_weight);
- }else{
- if (pos.containsKey(Symbol.BACKOFF_WGHT_SYM_ID)==false)
- pos.put(Symbol.BACKOFF_WGHT_SYM_ID, NON_EXIST_WEIGHT);//indicate it is a backoof node, to distinguish from a pure suffix node
- }
- }
- }
-
- }
+ //add bow weight here
+ if(i==1){//force to override the backoff weight
+ Double backoff_weight = new Double(wrds[order+1]);
+ pos.put(Symbol.BACKOFF_WGHT_SYM_ID, backoff_weight.doubleValue());
+ }else{
+ if (pos.containsKey(Symbol.BACKOFF_WGHT_SYM_ID)==false)
+ pos.put(Symbol.BACKOFF_WGHT_SYM_ID, NON_EXIST_WEIGHT);//indicate it is a backoof node, to distinguish from a pure prefix node
+ }
+ }
+ }
}
+
+
+ /* ###################### not used
+ private boolean have_suffix_old(int[] words){
+ LMHash pos=root;
+ int i=words.length-1;
+ for(; i>=0; i--){//reverse search
+ LMHash next_layer=(LMHash) pos.get(words[i]+Symbol.lm_end_sym_id);
+ if(next_layer!=null){
+ pos=next_layer;
+ }else{
+ break;
+ }
+ }
+ if(i==-1 && pos.containsKey(Symbol.LM_HAVE_SUFFIX_SYM_ID))
+ return true;
+ else
+ return false;
+ }
+ */
+
- //not used
+ //in theory: 64bytes (init size is 5)
+ //in practice: 86 bytes (init size is 5)
+ //in practice: 132 bytes (init size is 10)
+ //in practice: 211 bytes (init size is 20)
+ //important note: if we use tbl.put(key, new Integer(1)) instead of tbl.put(key, (new Integer(1)).intValue()), then for each element, we waste 16 bytes for the Integer object,
+ //and the GC will not collect this Double object, because the hashtable ref it
public static class LMHash //4bytes
{
//######note: key must be positive integer, and value must not be null
@@ -457,12 +585,12 @@ private void add_rule(String line, int order, boolean is_add_suffix_infor){//for
*/
//TODO: should round the array size to a prime number?
- static double load_factor = 0.5;
+ static double load_factor = 0.6;
static int default_init_size = 5;
- int size=0;//4 bytes
- int[] key_array;//8 bytes
- Object[] val_array;//8 bytes
+ int size=0;//8 bytes?
+ int[] key_array;//pointer itself is 4 bytes?, when it is newed, then add 10 more bytes, and the int itself
+ Object[] val_array;//pointer itself is 4 bytes?, when it is newed, then add 10 more bytes, and the object itself
public LMHash(int init_size){
key_array = new int[init_size];
@@ -550,4 +678,4 @@ private void expand_tbl(){
}
}
-}
+}
View
666 src/edu/jhu/joshua/decoder/feature_function/language_model/LMGrammar_JAVA_GENERAL.java
@@ -1,666 +0,0 @@
-package edu.jhu.joshua.decoder.feature_function.language_model;
-
-import java.io.BufferedReader;
-import java.util.HashMap;
-
-import edu.jhu.joshua.decoder.Decoder;
-import edu.jhu.joshua.decoder.Support;
-import edu.jhu.joshua.decoder.Symbol;
-import edu.jhu.lzfUtility.FileUtility;
-
-/* Zhifei Li, <zhifei.work@gmail.com>
-* Johns Hopkins University
-*/
-
-/*this class implement
- * (1) read the LM file into a Trie data structure
- * (2) get LM probablity for a given n-grm
- * (3) get equivilent state
- */
-
-public class LMGrammar_JAVA_GENERAL extends LMGrammar {
- /*a backoff node is a hashtable, it may include:
- * (1) probabilititis for next words
- * (2) pointers to a next-layer backoff node (hashtable)
- * (3) backoff weight for this node
- * (4) suffix/prefix flag to indicate that there is ngrams start from this suffix
- */
- private LMHash root=null;
- private int g_n_bow_nodes=0;
- private int g_n_suffix_nodes=0;
- static private float MIN_LOG_P= -9999.0f; //ngram prob must be smaller than this number
- static private double SUFFIX_ONLY= MIN_LOG_P*3; //ngram prob must be smaller than this number
-
- private double NON_EXIST_WEIGHT=0;//the history has not appeared at all
- private int num_rule_read=0;
- boolean g_is_add_prefix_infor=false;
- boolean g_is_add_suffix_infor=false;
-
- HashMap request_cache_prob = new HashMap();//cmd with result
- HashMap request_cache_backoff = new HashMap();//cmd with result
- HashMap request_cache_left_equiv = new HashMap();//cmd with result
- HashMap request_cache_right_equiv = new HashMap();//cmd with result
- int cache_size_limit= 250000;
-
-
- public LMGrammar_JAVA_GENERAL(int order, boolean is_add_suffix_infor, boolean is_add_prefix_infor){
- super(order);
- System.out.println("use java lm");
- g_is_add_prefix_infor = is_add_prefix_infor;
- g_is_add_suffix_infor = is_add_suffix_infor;
- Symbol.add_global_symbols(true);
- /*//debug
- LMHash[] t_arrays = new LMHash[10000000];
- System.out.println("##### mem used (kb): " + Support.getMemoryUse());
- System.out.println("##### time used (seconds): " + (System.currentTimeMillis()-start_loading_time)/1000);
- for(int i=0; i<10000000;i++){
- LMHash t_h = new LMHash(5);
- double j=0.1f;
- t_h.put(i, j);
-
- //System.out.println("ele is " + t_h.get(i));
- t_arrays[i]=t_h;
- if(i%1000000==0){
- System.out.println(i +" ##### mem used (kb): " + Support.getMemoryUse());
- System.out.println("##### time used (seconds): " + (System.currentTimeMillis()-start_loading_time)/1000);
- }
- }
- System.exit(0);
- //end*/
-
-
- /*//debug
- double[] bow = new double[1];
- int[] backoff_history = new int[1];
- backoff_history[0]=Symbol.UNTRANS_SYM_ID;
- boolean finalized_backoff = check_backoff_weight(backoff_history, bow, 0);//backoff weight is already added outside this function?
-
- //System.out.println("bow_weigth id: " + Symbol.BACKOFF_WGHT_SYM_ID);
- System.out.println("is final: " + finalized_backoff);
- System.out.println("bow: " + bow[0]);
- System.exit(0);*/
- }
-
- public void write_vocab_map_srilm(String fname){
- System.out.println("Error: call write_vocab_map_srilm in java, must exit");
- System.exit(0);
- }
-
-
- // signature of this item: i, j, lhs, states (in fact, we do not need i, j)
- private String get_signature(int[] words){
- StringBuffer res = new StringBuffer(words.length);
- for(int i=0; i<words.length; i++){
- res.append(" ");
- res.append(words[i]);
- }
- return res.toString();
- }
-
-
-
- /*note: the mismatch between srilm and our java implemtation is in: when unk words used as context, in java it will be replaced with "<unk>", but srilm will not, therefore the
- *lm cost by srilm may be smaller than by java, this happens only when the LM file have "<unk>" in backoff state*/
- //note: we never use check_bad_stuff here
- protected double get_prob_specific(int[] ngram_wrds_in, int order, boolean check_bad_stuff){
- Double res;
- //cache
- //String sig = get_signature(ngram_wrds_in);
- //res = (Double)request_cache_prob.get(sig);
- //if(res!=null)return res;
-
- int[] ngram_wrds=replace_with_unk(ngram_wrds_in);//TODO
- if(ngram_wrds[ngram_wrds.length-1]==Symbol.UNK_SYM_ID){//TODO: wrong implementation in hiero
- res= -Decoder.lm_ceiling_cost;
- }else{
- //TODO: untranslated words
- if(root==null){
- System.out.println("root is null");
- System.exit(0);
- }
- int last_word_id = ngram_wrds[ngram_wrds.length-1];
- LMHash pos =root;
- //Double prob=(Double)pos.get(last_word_id);
- Double prob=get_valid_prob(pos,last_word_id);
- double bow_sum=0;
- for(int i=ngram_wrds.length-2; i>=0; i--){//reverse search, start from the second-last word
- LMHash next_layer=(LMHash) pos.get(ngram_wrds[i]+Symbol.lm_end_sym_id);
- if(next_layer!=null){//have context/bow node
- pos=next_layer;
- //Double prob2=(Double)pos.get(last_word_id);
- Double prob2=get_valid_prob(pos,last_word_id);
- if(prob2!=null){//reset, if backoff, will at least back off to here
- prob=prob2;
- bow_sum =0;
- }else{
- Double bow = (Double) pos.get( Symbol.BACKOFF_WGHT_SYM_ID );
- if(bow!=null)
- bow_sum += bow;
- }
- }else{//do not have context/bow node
- break;
- }
- }
- res = prob + bow_sum;
- }
- //cache
- //if(request_cache_prob.size()>cache_size_limit)
- // request_cache_prob.clear();
- //request_cache_prob.put(sig, res);
-
- return res;
- }
-
- private Double get_valid_prob(LMHash pos, int wrd){
- Double res= (Double)pos.get(wrd);
- if(g_is_add_suffix_infor==false)
- return res;
-
- if(res!=null){
- if(res==SUFFIX_ONLY)
- return null;
- if(res>MIN_LOG_P)//logP without suffix flag
- return res;