Changeset a6e708f for _old/app/src/dgp

Timestamp:

12/14/11 16:08:41 (13 years ago)

Author:

tom <tom@…>

Branches:

master

Children:

93afab8

Parents:

1e121f4

git-author:

tom <tom@…> (12/14/11 16:08:41)

git-committer:

tom <tom@…> (12/14/11 16:08:41)

Message:

ANULOWANIE POPRZEDNIEGO COMMITU

Revert "Replacing old implementation with working implementation"

This reverts commit 1e121f45e2d091fcd34a893291b8453e350d5884.

Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.

Committer: tom <tom@lim.(none)>

On branch master
Changes to be committed:

(use "git reset HEAD <file>..." to unstage)

modified: _old/app/Makefile
deleted: _old/app/conf/Makefile
deleted: _old/app/conf/compiledic.conf
deleted: _old/app/conf/cor.conf
deleted: _old/app/conf/dgc.conf
deleted: _old/app/conf/dgp.conf
deleted: _old/app/conf/gph.conf
deleted: _old/app/conf/grp.conf
deleted: _old/app/conf/gue.conf
deleted: _old/app/conf/kor.conf
deleted: _old/app/conf/lem.conf
deleted: _old/app/conf/mar.conf
deleted: _old/app/conf/ser.conf
deleted: _old/app/conf/utt.conf
modified: _old/app/src/common/Makefile
modified: _old/app/src/compiledic/Makefile
modified: _old/app/src/compiledic/aut2fsa.cc
modified: _old/app/src/cor/Makefile
modified: _old/app/src/dgp/Makefile
new file: _old/app/src/dgp/canonize
new file: _old/app/src/dgp/dgc
modified: _old/app/src/dgp/grammar.hh
modified: _old/app/src/dgp/mgraph.hh
modified: _old/app/src/dgp/sgraph.hh
modified: _old/app/src/dgp/thesymbols.hh
new file: _old/app/src/dgp/tre
modified: _old/app/src/gue/Makefile
modified: _old/app/src/gue/guess.cc
modified: _old/app/src/kor/Makefile
modified: _old/app/src/kor/corlist.cc
modified: _old/app/src/kor/corr.cc
new file: _old/app/src/kor/corr.hh
modified: _old/app/src/kor/main.cc
modified: _old/app/src/lem/Makefile
modified: _old/app/src/lem/lem.cc
modified: _old/app/src/lib/Makefile
modified: _old/app/src/lib/auttools.cc
modified: _old/app/src/lib/symtab.cc
modified: _old/app/src/lib/tft.h
modified: _old/app/src/lib/tfti.h
modified: _old/app/src/lib/ttrans.h
modified: _old/app/src/lib/word.cc
modified: _old/app/src/lib/word.h
modified: _old/app/src/tok.c/Makefile
modified: _old/app/src/tok.c/cmdline_tok.ggo
modified: _old/app/src/tok.c/common_tok.cc
modified: _old/app/src/tok/Makefile
modified: _old/nawszelkiwypadek/tools/aut2fsa
modified: _old/nawszelkiwypadek/tools/cor_dic/makeLabels.pl
modified: _old/nawszelkiwypadek/tools/cor_dic/prep.pl
modified: _old/nawszelkiwypadek/tools/fsm2aut
modified: _old/nawszelkiwypadek/tools/gue_dic/canon.pl
modified: _old/nawszelkiwypadek/tools/gue_dic/compile_user_dict.pl
modified: _old/nawszelkiwypadek/tools/gue_dic/count_prefs.pl
modified: _old/nawszelkiwypadek/tools/gue_dic/cut_prefs.pl
modified: _old/nawszelkiwypadek/tools/gue_dic/makeLabels.pl
modified: _old/nawszelkiwypadek/tools/gue_dic/prep.pl
modified: _old/nawszelkiwypadek/tools/gue_dic/prep_user_dict.pl
modified: _old/nawszelkiwypadek/tools/gue_dic/rmDup.pl
modified: _old/nawszelkiwypadek/tools/gue_dic/stat.pl
modified: _old/nawszelkiwypadek/tools/gue_dic/stat_pre.pl
modified: _old/nawszelkiwypadek/tools/lem_dic/makeLabels.pl
modified: _old/nawszelkiwypadek/tools/lem_dic/prep.pl
modified: auto/defaults
modified: auto/options
modified: auto/output/Makefile
modified: auto/output/config_h
modified: auto/summary
modified: configure

Location:

_old/app/src/dgp

Files:

• Makefile (modified) (3 diffs)
• canonize (added)
• dgc (added)
• grammar.hh (modified) (1 diff)
• mgraph.hh (modified) (1 diff)
• sgraph.hh (modified) (1 diff)
• thesymbols.hh (modified) (1 diff)
• tre (added)

_old/app/src/dgp/Makefile

@@ +1 @@
+
+
 SHELL = /bin/sh
 LIB_PATH=../../lib
@@ -7 +9 @@
 #vpath %.o  .
 
-CXXFLAGS = -O2 -static -fpermissive
+CXXFLAGS = -O2 -static
 
 sources = main.cc grammar.cc symbol.cc mgraph.cc sgraph.cc dgp0.cc cmdline.cc \
           $(COMMON_PATH)/common.cc global.cc
 
-bin  = dgp dgc canonize tre
+bin  = dgp
 
 # plik *.o sa umieszczane w podkatalogu o
@@ -43 +45 @@
 
 clean:
-        rm ${bin} ${objs} cmdline.cc cmdline.h *.d
+        rm ${bin} ${objs} cmdline.cc cmdline.h
+        rm -rf *.d
 
 prof: dgp

_old/app/src/dgp/grammar.hh

@@ -11 +11 @@
 #include "sgraph.hh"
 
+
+using namespace std;
 
 class Link

_old/app/src/dgp/mgraph.hh

@@ -7 +7 @@
 #include "thesymbols.hh"
 #include "../common/common.h"
+
+
+using namespace std;
 
 class MNode

_old/app/src/dgp/sgraph.hh

@@ -11 +11 @@
 #include "thesymbols.hh"
 
+
+using namespace std;
 
 class MNode;

_old/app/src/dgp/thesymbols.hh

@@ -8 +8 @@
 #include <set>
 #include <bitset>
+
+
+using namespace std;
 
 typedef Symbol<1> Cat;