Changeset 3748bd1 for app

Timestamp:

05/09/08 10:38:46 (16 years ago)

Author:

obrebski <obrebski@…>

Branches:

master, help

Children:

6ac84d8

Parents:

9b57c4d

git-author:

obrebski <obrebski@…> (05/09/08 10:38:46)

git-committer:

obrebski <obrebski@…> (05/09/08 10:38:46)

Message:

1) dgp nie wysypuje sie na nieznanych kategoriach
2) dodane i uzupelnione konfigi

git-svn-id: ​svn://atos.wmid.amu.edu.pl/utt@49 e293616e-ec6a-49c2-aa92-f4a8b91c5d16

Location:

app

Files:

• conf/dgc.conf (modified) (1 diff)
• conf/dgp.conf (added)
• conf/gph.conf (added)
• src/dgp/cmdline_dgp.ggo (modified) (1 diff)
• src/dgp/dgc (modified) (3 diffs)
• src/dgp/grammar.hh (modified) (1 diff)
• src/dgp/main.cc (modified) (2 diffs)
• src/dgp/mgraph.cc (modified) (1 diff)
• src/gph/gph (modified) (1 diff)

app/conf/dgc.conf

@@ -13 +13 @@
 categories = PATH_PREFIX/share/utt/cats.dgc
 grammar = PATH_PREFIX/share/utt/gram.dgc
+outputfile = PATH_PREFIX/share/utt/gram.dgp

app/src/dgp/cmdline_dgp.ggo

@@ -3 +3 @@
 
 option  "grammar"       g       "Grammar file"
-                                string typestr="filename" default="dgp.dgp"
+                                string no typestr="filename"
 
 option  "long"          l       "Long output"

app/src/dgp/dgc

@@ -38 +38 @@
                 next unless length;
                 my ($name, $value) = split(/\s*=\s*/, $_, 2);
-                if(($name eq "catfile")or($name eq "c")){
+                if(($name eq "categories")or($name eq "c")){
                         $catfile=$value;
                 }
-                elsif(($name eq "dicfile")or($name eq "d")){
+                elsif(($name eq "dictionary")or($name eq "d")){
                         $dicfile=$value;
                 }
-                elsif(($name eq "gramfile")or($name eq "g")){
+                elsif(($name eq "grammar")or($name eq "g")){
                         $gramfile=$value;
                 }
@@ -61 +61 @@
 
 GetOptions("help|h" => \$help,
-           "catfile|c=s" => \$catfile,
-           "dicfile|d=s" => \$dicfile,
-           "gramfile|g=s" => \$gramfile,
+           "categories|c=s" => \$catfile,
+           "dictionary|d=s" => \$dicfile,
+           "grammar|g=s" => \$gramfile,
            "outputfile|o=s" => \$outputfile);
+
+my $homedir = $ENV{'HOME'};
+$catfile =~ s/~/$homedir/;
+$dicfile =~ s/~/$homedir/;
+$gramfile =~ s/~/$homedir/;
+$outputfile =~ s/~/$homedir/;
+
 
 if($help)
@@ -72 +79 @@
 
 Options:
-   --catfile -c filename        List of syntactic categories.
-   --dicfile -d filename        Dictionary.
-   --gramfile -g filename       List of grammar rules.
-   --outputfile -o filename     Output filename.
+   --categories -c filename     List of syntactic categories.
+   --dictionary -d filename     Dictionary.
+   --grammar -g filename        List of grammar rules.
+   --outputfile -o filename     Output file name.
    --help -h                    Help.
 END

app/src/dgp/grammar.hh

@@ -18 +18 @@
   //  enum CONSTR { SGL, OBL, LEFT, RIGHT, INIT, NONINIT, FIN, NONFIN };
 
-  Grammar() : types_sz(0), cats_sz(0) { } ;
+  Grammar() : types_sz(0), cats_sz(0) {} ;
   
   int types_sz;

app/src/dgp/main.cc

@@ -20 +20 @@
 int segcount=0;
 char seg_mnode[MAXSEGMENTS];
+char grammarfile[255];
+
 
 Grammar grammar;
@@ -41 +43 @@
   process_common_options(&args,argv[0]);
 
-//   if(args.help_given) cmdline_parser_print_help ();
+  if(!args.grammar_given)
+    fprintf(stderr,"dgp: no grammar given\n");
 
-//   if(args.input_given)
-//     if(!(inputf=fopen(args.input_arg,"r")))
-//       fprintf(stderr,"dgp: input file not found: %s.\n", args.input_arg), exit(1);
+  expand_path(args.grammar_arg,grammarfile);
 
-//   if(args.output_given)
-//     if(!(outputf=fopen(args.output_arg,"w")))
-//       fprintf(stderr,"dgp: cannot open output file: %s.\n", args.output_arg), exit(1);
-
-  if(!(grammarf=fopen(args.grammar_arg,"r")))
-    fprintf(stderr,"dgp: grammar file not found: %s.\n", args.grammar_arg), exit(1);
+  if(!(grammarf=fopen(grammarfile,"r")))
+    fprintf(stderr,"dgp: grammar file not found: %s.\n", grammarfile), exit(1);
 
   if(args.debug_given) debug=true;

app/src/dgp/mgraph.cc

@@ -23 +23 @@
   if(*cat) ++cat;
   
-  Cat::add(cat);
-  nodes[n].cat=cat;
+//  Cat::add(cat);
+  if(Cat::index(cat)>0)
+    nodes[n].cat=cat;
+  else
+    nodes[n].cat="NULL";
   
   nodes[n].pred.clear();

app/src/gph/gph

@@ -80 +80 @@
 
 Options:
-   -p tag               Process segments with this tag as nodes.
-   -r tag               Start new graph at this tag.
-   -f filename          Input file.
-   -o filename          Output file.
-   -i                   Toggle interactive mode (default=off).
+   --process=TYPE -p TYPE    Process segments of type TYPE.
+   --reset=TYPE -r TYPE      Start new graph at tags of type TYPE.
+   --inputfile=FILE -f FILE  Input file.
+   --outputfile=FILE -o FILE Output file.
+   --interactive -i          Toggle interactive mode (default=off).
 END
 ;