[frog] 01/01: Imported Upstream version 0.12.20
Joost van Baal
joostvb at moszumanska.debian.org
Sun Jul 5 03:33:13 UTC 2015
This is an automated email from the git hooks/post-receive script.
joostvb pushed a commit to annotated tag upstream/0.12.20
in repository frog.
commit 5b22fc864d62ad69436de10538505c49974b46cb
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date: Sun Jul 5 05:26:39 2015 +0200
Imported Upstream version 0.12.20
---
AUTHORS | 5 +--
ChangeLog | 31 ++++++++++++++
NEWS | 8 +++-
configure | 20 ++++-----
configure.ac | 2 +-
docs/frog.1 | 89 +++++++++++++++++++++++----------------
include/frog/Frog.h | 4 +-
include/frog/FrogAPI.h | 4 +-
include/frog/Parser.h | 4 +-
include/frog/cgn_tagger_mod.h | 4 +-
include/frog/iob_tagger_mod.h | 4 +-
include/frog/mblem_mod.h | 4 +-
include/frog/mbma_mod.h | 4 +-
include/frog/mwu_chunker_mod.h | 4 +-
include/frog/ner_tagger_mod.h | 4 +-
include/frog/ucto_tokenizer_mod.h | 4 +-
src/Frog-util.cxx | 4 +-
src/Frog.cxx | 8 ++--
src/FrogAPI.cxx | 20 ++++-----
src/Parser.cxx | 4 +-
src/cgn_tagger_mod.cxx | 4 +-
src/iob_tagger_mod.cxx | 4 +-
src/mblem_mod.cxx | 4 +-
src/mblem_prog.cxx | 6 +--
src/mbma_mod.cxx | 4 +-
src/mbma_prog.cxx | 6 +--
src/mwu_chunker_mod.cxx | 4 +-
src/ner_tagger_mod.cxx | 4 +-
src/ucto_tokenizer_mod.cxx | 4 +-
29 files changed, 161 insertions(+), 110 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 2cd033a..4ce5490 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,7 +16,7 @@ Sander Canisius (CSI-DP)
Jakub Zavrel (MBT)
Supporters:
-People who contributed to Frog by suggesting improvements,
+People who contributed to Frog by suggesting improvements,
filing bug reports, asking the right questions etc.:
Walter Daelemans
@@ -24,8 +24,7 @@ Micha Hulsbosch
Emmanuel Keuleers
Martin Reynaart
Erik Tjong Kim Sang
+Manos Tsagkias
Frederik Vaassen
and many others.
-
-
diff --git a/ChangeLog b/ChangeLog
index 597608f..e580691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2015-01-29 11:10 sloot
+
+ * [r18008] AUTHORS: credits
+
+2015-01-29 10:58 sloot
+
+ * [r18007] src/FrogAPI.cxx: fixed terrible bug. MWU was not
+ initialized in server mode when mbma was skipped/
+
+2015-01-21 14:07 sloot
+
+ * [r17992] include/frog/Frog.h, include/frog/FrogAPI.h,
+ include/frog/Parser.h, include/frog/cgn_tagger_mod.h,
+ include/frog/iob_tagger_mod.h, include/frog/mblem_mod.h,
+ include/frog/mbma_mod.h, include/frog/mwu_chunker_mod.h,
+ include/frog/ner_tagger_mod.h, include/frog/ucto_tokenizer_mod.h,
+ src/Frog-util.cxx, src/Frog.cxx, src/FrogAPI.cxx, src/Parser.cxx,
+ src/cgn_tagger_mod.cxx, src/iob_tagger_mod.cxx,
+ src/mblem_mod.cxx, src/mblem_prog.cxx, src/mbma_mod.cxx,
+ src/mbma_prog.cxx, src/mwu_chunker_mod.cxx,
+ src/ner_tagger_mod.cxx, src/ucto_tokenizer_mod.cxx: 2015
+
+2014-12-02 14:57 sloot
+
+ * [r17899] src/Frog.cxx: typo
+
+2014-12-02 14:57 sloot
+
+ * [r17898] docs/frog.1: fixed hyphens according to
+ /usr/share/doc/groff-base/README.Debian
+
2014-11-28 13:24 mvgompel
* [r17877] configure.ac: Changing behaviour of --with-python, point
diff --git a/NEWS b/NEWS
index 8b2214d..1ce4899 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
-0.12.19 - 2014-09-23
+0.12.20 - 2015-01-29
[Ko van der Sloot]
* release
+ * fixed terrible bug in FrogServer (unitialized MWU could happen)
+
+0.12.19 - 2014-12-01
+[Ko van der Sloot]
+ * release
+ * some bug fixes for FoliA support
0.12.18 - 2014-09-16
* A true FrogAPI is added
diff --git a/configure b/configure
index 5991827..792105d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for frog 0.12.19.
+# Generated by GNU Autoconf 2.69 for frog 0.12.20.
#
# Report bugs to <timbl at uvt.nl>.
#
@@ -589,8 +589,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='frog'
PACKAGE_TARNAME='frog'
-PACKAGE_VERSION='0.12.19'
-PACKAGE_STRING='frog 0.12.19'
+PACKAGE_VERSION='0.12.20'
+PACKAGE_STRING='frog 0.12.20'
PACKAGE_BUGREPORT='timbl at uvt.nl'
PACKAGE_URL=''
@@ -1393,7 +1393,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures frog 0.12.19 to adapt to many kinds of systems.
+\`configure' configures frog 0.12.20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1463,7 +1463,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of frog 0.12.19:";;
+ short | recursive ) echo "Configuration of frog 0.12.20:";;
esac
cat <<\_ACEOF
@@ -1609,7 +1609,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-frog configure 0.12.19
+frog configure 0.12.20
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2262,7 +2262,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by frog $as_me 0.12.19, which was
+It was created by frog $as_me 0.12.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3125,7 +3125,7 @@ fi
# Define the identity of the package.
PACKAGE='frog'
- VERSION='0.12.19'
+ VERSION='0.12.20'
cat >>confdefs.h <<_ACEOF
@@ -18837,7 +18837,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by frog $as_me 0.12.19, which was
+This file was extended by frog $as_me 0.12.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18903,7 +18903,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-frog config.status 0.12.19
+frog config.status 0.12.20
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ab77737..50d3147 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/configure.ac $
AC_PREREQ(2.59)
-AC_INIT([frog], [0.12.19], [timbl at uvt.nl])
+AC_INIT([frog], [0.12.20], [timbl at uvt.nl])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/docs/frog.1 b/docs/frog.1
index 3c1d314..f29d52b 100644
--- a/docs/frog.1
+++ b/docs/frog.1
@@ -1,129 +1,144 @@
-.TH frog 1 "2012 January 31"
+.TH frog 1 "2014 december 2"
.SH NAME
-frog - Dutch morpho-syntactic analyzer, IOB chunker and dependency parser
+frog \- Dutch morpho-syntactic analyzer, IOB chunker and dependency parser
.SH SYNOPSYS
frog [options]
-frog -t test-file
+frog \-t test\-file
.SH DESCRIPTION
-frog is an integration of memory-based natural language processing (NLP) modules developed for Dutch.
+frog is an integration of memory\(hy-based natural language processing (NLP) modules developed for Dutch.
frog's current version will tokenize, tag, lemmatize, and morphologically segment word tokens in Dutch text files, add IOB chunks and will assign a dependency graph to each sentence.
.SH OPTIONS
-.BR -c " <configfile>"
+.BR \-c " <configfile>"
.RS
set the configuration using 'file'
.RE
-.BR -d " <level>"
+.BR \-\-debug =<modele><level>,...
.RS
-set debug level.
+set debug level per module.
+Tokenizer (t), Lemmatizer (l), Morphological Analyzer (a), Chunker (c), Multi\(hyWord Units (m), Named Entity Recognition (n), or Parser (p).
+
+(e.g. \-\-debug=l5,n3 sets the level for the Lemmatizer to 5 and for the NER
+to 3 )
+
.RE
-.BR -e " <encoding>"
+.BR \-d " <level>"
+.RS
+set global debug level. (for all modules)
+.RE
+
+.BR \-e " <encoding>"
.RS
set input encoding. (default UTF8)
.RE
-.BR -h
+.BR \-h
.RS
give some help
.RE
-.BR --keep-parser-files =[yes|no]
+.BR \-\-keep\-parser\-files =[yes|no]
.RS
keep the intermediate files from the parser. Last sentence only!
.RE
-.BR -n
+.BR \-n
.RS
-assume inputfile to hold one sentence per line
+assume inputfile to hold one sentence per line.
+
+Very useful when running interactive, otherwise an empty line is needed to
+signal end of input.
.RE
-.BR -o " <file>"
+.BR \-o " <file>"
.RS
send output to 'file' instead of stdout. Defaults to the name of the inputfile with '.out' appended.
.RE
-.BR --outputdir " <dir>"
+.BR \-\-outputdir " <dir>"
.RS
send all output to 'dir' instead of stdout. Creates filenames from the inputfilename(s) with '.out' appended.
.RE
-.BR --skip =[aclmnpt]
+.BR \-\-skip =[aclmnpt]
.RS
-skip parts of the proces: Tokenizer (t), Chunker (c), Lemmatizer (l), Morphological Analyzer (a), Multi-Word unit (m), Named-Entity recognizer (n) or Parser (p)
+skip parts of the proces: Tokenizer (t), Chunker (c), Lemmatizer (l), Morphological Analyzer (a), Multi\(hy-Word unit (m), Named\(hyEntity recognizer (n) or Parser (p)
.RE
-.BR -Q
+.BR \-Q
.RS
Enable quotedetection in the tokenizer. May run havock!
.RE
-.BR -S " <port>"
+.BR \-S " <port>"
.RS
Run a server on 'port'
.RE
-.BR -t " <file>"
+.BR \-t " <file>"
.RS
-process 'file'
+process 'file'.
+
+When \-t is omitted, Frog will run in interactive mode.
.RE
-.BR -x " <xmlfile>"
+.BR \-x " <xmlfile>"
.RS
-process 'xmlfile', which is supposed to be in FoLiA format! If 'xmlfile' is empty, and
-.BR --testdir =<dir>
+process 'xmlfile', which is supposed to be in FoLiA format! If 'xmlfile' is empty, and
+.BR \-\-testdir =<dir>
is provided, all '.xml' files in 'dir' will be processed as FoLia XML.
.RE
-.BR --textclass "=<cls>"
+.BR \-\-textclass "=<cls>"
.RS
-When
-.BR -x
+When
+.BR \-x
is given, use 'cls' to find text in the FoLiA document(s).
.RE
-.BR --testdir =<dir>
+.BR \-\-testdir =<dir>
.RS
-process all files in 'dir'. When the input mode is XML, only '.xml' files are teken from 'dir'. see also
-.B --outputdir
+process all files in 'dir'. When the input mode is XML, only '.xml' files are teken from 'dir'. see also
+.B \-\-outputdir
.RE
-.BR --tmpdir =<dir>
+.BR \-\-tmpdir =<dir>
.RS
location to store intermediate files. Default /tmp.
.RE
-.BR --threads =<n>
+.BR \-\-threads =<n>
.RS
use a maximum of 'n' threads. The default is to take whatever is needed.
In servermode we always run on 1 thread.
.RE
-.BR -V " or " --version
+.BR \-V " or " \-\-version
.RS
show version info
.RE
-.BR --xmldir =<dir>
+.BR \-\-xmldir =<dir>
.RS
generate FoLiA XML output and send it to 'dir'. Creates filenames from the inputfilename with '.xml' appended. (Except when it already ends with '.xml')
.RE
-.BR -X " <file>"
+.BR \-X " <file>"
.RS
generate FoLiA XML output and send it to 'file'. Defaults to the name of the inputfile(s) with '.xml' appended. (Except when it already ends with '.xml')
.RE
-.BR --id "=<id>"
+.BR \-\-id "=<id>"
.RS
-When
-.BR -X
+When
+.BR \-X
for FoLia is given, use 'id' to give the doc an ID.
.RE
diff --git a/include/frog/Frog.h b/include/frog/Frog.h
index 680df58..e3fcc71 100755
--- a/include/frog/Frog.h
+++ b/include/frog/Frog.h
@@ -1,9 +1,9 @@
/* ex: set tabstop=8 expandtab: */
/*
- $Id: Frog.h 17672 2014-09-16 12:32:10Z sloot $
+ $Id: Frog.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/Frog.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog
diff --git a/include/frog/FrogAPI.h b/include/frog/FrogAPI.h
index ddbdb20..a99afde 100644
--- a/include/frog/FrogAPI.h
+++ b/include/frog/FrogAPI.h
@@ -1,9 +1,9 @@
/* ex: set tabstop=8 expandtab: */
/*
- $Id: FrogAPI.h 17672 2014-09-16 12:32:10Z sloot $
+ $Id: FrogAPI.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/FrogAPI.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog
diff --git a/include/frog/Parser.h b/include/frog/Parser.h
index 7a42306..820a889 100644
--- a/include/frog/Parser.h
+++ b/include/frog/Parser.h
@@ -1,8 +1,8 @@
/*
- $Id: Parser.h 17714 2014-09-25 16:04:28Z sloot $
+ $Id: Parser.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/Parser.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch
diff --git a/include/frog/cgn_tagger_mod.h b/include/frog/cgn_tagger_mod.h
index 801551e..e7d7e92 100644
--- a/include/frog/cgn_tagger_mod.h
+++ b/include/frog/cgn_tagger_mod.h
@@ -1,8 +1,8 @@
/*
- $Id: cgn_tagger_mod.h 17616 2014-09-07 19:24:55Z mvgompel $
+ $Id: cgn_tagger_mod.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/cgn_tagger_mod.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/include/frog/iob_tagger_mod.h b/include/frog/iob_tagger_mod.h
index 7eb8b4d..33f64a1 100644
--- a/include/frog/iob_tagger_mod.h
+++ b/include/frog/iob_tagger_mod.h
@@ -1,8 +1,8 @@
/*
- $Id: iob_tagger_mod.h 17616 2014-09-07 19:24:55Z mvgompel $
+ $Id: iob_tagger_mod.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/iob_tagger_mod.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/include/frog/mblem_mod.h b/include/frog/mblem_mod.h
index d9854f3..c764241 100755
--- a/include/frog/mblem_mod.h
+++ b/include/frog/mblem_mod.h
@@ -1,8 +1,8 @@
/*
- $Id: mblem_mod.h 17809 2014-11-11 13:44:50Z sloot $
+ $Id: mblem_mod.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/mblem_mod.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/include/frog/mbma_mod.h b/include/frog/mbma_mod.h
index 861425f..b8959f5 100755
--- a/include/frog/mbma_mod.h
+++ b/include/frog/mbma_mod.h
@@ -1,8 +1,8 @@
/*
- $Id: mbma_mod.h 17822 2014-11-13 09:56:31Z sloot $
+ $Id: mbma_mod.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/mbma_mod.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/include/frog/mwu_chunker_mod.h b/include/frog/mwu_chunker_mod.h
index b4146e9..00d86c6 100755
--- a/include/frog/mwu_chunker_mod.h
+++ b/include/frog/mwu_chunker_mod.h
@@ -1,8 +1,8 @@
/*
- $Id: mwu_chunker_mod.h 17616 2014-09-07 19:24:55Z mvgompel $
+ $Id: mwu_chunker_mod.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/mwu_chunker_mod.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/include/frog/ner_tagger_mod.h b/include/frog/ner_tagger_mod.h
index 08291f4..bf30d1e 100644
--- a/include/frog/ner_tagger_mod.h
+++ b/include/frog/ner_tagger_mod.h
@@ -1,8 +1,8 @@
/*
- $Id: ner_tagger_mod.h 17616 2014-09-07 19:24:55Z mvgompel $
+ $Id: ner_tagger_mod.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/ner_tagger_mod.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/include/frog/ucto_tokenizer_mod.h b/include/frog/ucto_tokenizer_mod.h
index fd85cab..cb3b549 100644
--- a/include/frog/ucto_tokenizer_mod.h
+++ b/include/frog/ucto_tokenizer_mod.h
@@ -1,8 +1,8 @@
/*
- $Id: ucto_tokenizer_mod.h 17661 2014-09-15 14:59:03Z sloot $
+ $Id: ucto_tokenizer_mod.h 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/include/frog/ucto_tokenizer_mod.h $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/src/Frog-util.cxx b/src/Frog-util.cxx
index 300f455..348770d 100755
--- a/src/Frog-util.cxx
+++ b/src/Frog-util.cxx
@@ -1,8 +1,8 @@
/*
- $Id: Frog-util.cxx 17658 2014-09-15 13:59:33Z sloot $
+ $Id: Frog-util.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/Frog-util.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog
diff --git a/src/Frog.cxx b/src/Frog.cxx
index a2dbef9..268d9c6 100755
--- a/src/Frog.cxx
+++ b/src/Frog.cxx
@@ -1,9 +1,9 @@
/* ex: set tabstop=8 expandtab: */
/*
- $Id: Frog.cxx 17829 2014-11-18 14:44:00Z sloot $
+ $Id: Frog.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/Frog.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch
@@ -98,7 +98,7 @@ void usage( ) {
cout << "\t============= INPUT MODE (mandatory, choose one) ========================\n"
<< "\t -e <encoding> specify encoding of the input (default UTF-8)\n"
<< "\t -t <testfile> Run frog on this file\n"
- << "\t -x <testfile> Run frog on this FoLiA XML file. Or the files form 'testdir'\n"
+ << "\t -x <testfile> Run frog on this FoLiA XML file. Or the files from 'testdir'\n"
<< "\t --textclass=<cls> use the specified class to search for text in the the FoLia docs.\n"
<< "\t --testdir=<directory> All files in this dir will be tested\n"
<< "\t --uttmarker=<mark> utterances are separated by 'mark' symbols"
@@ -418,7 +418,7 @@ bool parse_args( TiCC::CL_Options& Opts, FrogOptions& options,
int main(int argc, char *argv[]) {
- cerr << "frog " << VERSION << " (c) ILK 1998 - 2014" << endl;
+ cerr << "frog " << VERSION << " (c) ILK 1998 - 2015" << endl;
cerr << "Induction of Linguistic Knowledge Research Group, Tilburg University" << endl;
cerr << "based on [" << Tokenizer::VersionName() << ", "
<< folia::VersionName() << ", "
diff --git a/src/FrogAPI.cxx b/src/FrogAPI.cxx
index c18a938..84ea042 100644
--- a/src/FrogAPI.cxx
+++ b/src/FrogAPI.cxx
@@ -1,9 +1,9 @@
/* ex: set tabstop=8 expandtab: */
/*
- $Id: FrogAPI.cxx 17749 2014-10-20 13:16:50Z sloot $
+ $Id: FrogAPI.cxx 18007 2015-01-29 10:58:54Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/FrogAPI.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch
@@ -183,14 +183,14 @@ FrogAPI::FrogAPI( const FrogOptions &opt,
if ( stat ) {
if ( options.doDaringMorph )
myMbma->setDaring(true);
- if ( options.doMwu ){
- myMwu = new Mwu(theErrLog);
- stat = myMwu->init( configuration );
- if ( stat && options.doParse ){
- myParser = new Parser(theErrLog);
- stat = myParser->init( configuration );
- }
- }
+ }
+ }
+ if ( stat && options.doMwu ){
+ myMwu = new Mwu(theErrLog);
+ stat = myMwu->init( configuration );
+ if ( stat && options.doParse ){
+ myParser = new Parser(theErrLog);
+ stat = myParser->init( configuration );
}
}
}
diff --git a/src/Parser.cxx b/src/Parser.cxx
index d45c2eb..2cc4772 100644
--- a/src/Parser.cxx
+++ b/src/Parser.cxx
@@ -1,8 +1,8 @@
/*
- $Id: Parser.cxx 17714 2014-09-25 16:04:28Z sloot $
+ $Id: Parser.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/Parser.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch
diff --git a/src/cgn_tagger_mod.cxx b/src/cgn_tagger_mod.cxx
index f23f799..25ade61 100644
--- a/src/cgn_tagger_mod.cxx
+++ b/src/cgn_tagger_mod.cxx
@@ -1,8 +1,8 @@
/*
- $Id: cgn_tagger_mod.cxx 17650 2014-09-13 20:18:58Z mvgompel $
+ $Id: cgn_tagger_mod.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/cgn_tagger_mod.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch
diff --git a/src/iob_tagger_mod.cxx b/src/iob_tagger_mod.cxx
index 83f81cf..1a7edc2 100644
--- a/src/iob_tagger_mod.cxx
+++ b/src/iob_tagger_mod.cxx
@@ -1,8 +1,8 @@
/*
- $Id: iob_tagger_mod.cxx 17714 2014-09-25 16:04:28Z sloot $
+ $Id: iob_tagger_mod.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/iob_tagger_mod.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch
diff --git a/src/mblem_mod.cxx b/src/mblem_mod.cxx
index 9009ae8..2a07325 100755
--- a/src/mblem_mod.cxx
+++ b/src/mblem_mod.cxx
@@ -1,8 +1,8 @@
/*
- $Id: mblem_mod.cxx 17809 2014-11-11 13:44:50Z sloot $
+ $Id: mblem_mod.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/mblem_mod.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/src/mblem_prog.cxx b/src/mblem_prog.cxx
index f2ee1de..9d9695d 100644
--- a/src/mblem_prog.cxx
+++ b/src/mblem_prog.cxx
@@ -1,8 +1,8 @@
/*
- $Id: mblem_prog.cxx 17665 2014-09-15 15:58:01Z sloot $
+ $Id: mblem_prog.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/mblem_prog.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Morphological-Analyzer for Dutch
@@ -173,7 +173,7 @@ void Test( istream& in ){
int main(int argc, char *argv[]) {
std::ios_base::sync_with_stdio(false);
- cerr << "mblem " << VERSION << " (c) ILK 1998 - 2014" << endl;
+ cerr << "mblem " << VERSION << " (c) ILK 1998 - 2015" << endl;
cerr << "Induction of Linguistic Knowledge Research Group, Tilburg University" << endl;
TiCC::CL_Options Opts("c:t:hVd:a", "version");
try {
diff --git a/src/mbma_mod.cxx b/src/mbma_mod.cxx
index 0750702..858cb9e 100755
--- a/src/mbma_mod.cxx
+++ b/src/mbma_mod.cxx
@@ -1,8 +1,8 @@
/*
- $Id: mbma_mod.cxx 17822 2014-11-13 09:56:31Z sloot $
+ $Id: mbma_mod.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/mbma_mod.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/src/mbma_prog.cxx b/src/mbma_prog.cxx
index f449e8c..d74de59 100644
--- a/src/mbma_prog.cxx
+++ b/src/mbma_prog.cxx
@@ -1,8 +1,8 @@
/*
- $Id: mbma_prog.cxx 17665 2014-09-15 15:58:01Z sloot $
+ $Id: mbma_prog.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/mbma_prog.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Morphological-Analyzer for Dutch
@@ -192,7 +192,7 @@ void Test( istream& in ){
int main(int argc, char *argv[]) {
std::ios_base::sync_with_stdio(false);
- cerr << "mbma " << VERSION << " (c) ILK 1998 - 2014" << endl;
+ cerr << "mbma " << VERSION << " (c) ILK 1998 - 2015" << endl;
cerr << "Induction of Linguistic Knowledge Research Group, Tilburg University" << endl;
TiCC::CL_Options Opts("aVt:d:hc:","daring,version");
try {
diff --git a/src/mwu_chunker_mod.cxx b/src/mwu_chunker_mod.cxx
index a7ca357..d6a560f 100755
--- a/src/mwu_chunker_mod.cxx
+++ b/src/mwu_chunker_mod.cxx
@@ -1,8 +1,8 @@
/*
- $Id: mwu_chunker_mod.cxx 17616 2014-09-07 19:24:55Z mvgompel $
+ $Id: mwu_chunker_mod.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/mwu_chunker_mod.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
This file is part of frog.
diff --git a/src/ner_tagger_mod.cxx b/src/ner_tagger_mod.cxx
index ede670f..2a171c7 100644
--- a/src/ner_tagger_mod.cxx
+++ b/src/ner_tagger_mod.cxx
@@ -1,8 +1,8 @@
/*
- $Id: ner_tagger_mod.cxx 17650 2014-09-13 20:18:58Z mvgompel $
+ $Id: ner_tagger_mod.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/ner_tagger_mod.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch
diff --git a/src/ucto_tokenizer_mod.cxx b/src/ucto_tokenizer_mod.cxx
index c8307ac..cdd25cf 100644
--- a/src/ucto_tokenizer_mod.cxx
+++ b/src/ucto_tokenizer_mod.cxx
@@ -1,8 +1,8 @@
/*
- $Id: ucto_tokenizer_mod.cxx 17661 2014-09-15 14:59:03Z sloot $
+ $Id: ucto_tokenizer_mod.cxx 17992 2015-01-21 14:07:56Z sloot $
$URL: https://ilk.uvt.nl/svn/sources/Frog/trunk/src/ucto_tokenizer_mod.cxx $
- Copyright (c) 2006 - 2014
+ Copyright (c) 2006 - 2015
Tilburg University
A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/frog.git
More information about the debian-science-commits
mailing list