Changeset a6e708f for _old/app/src/kor


Ignore:
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/kor
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • _old/app/src/kor/Makefile

    r1e121f4 ra6e708f  
    1 PAR=-Wno-deprecated -fpermissive -static 
    2 PAR2=-c -Wno-deprecated -fpermissive 
     1PAR=-Wno-deprecated -m32 -fpermissive -static 
     2PAR2=-c -Wno-deprecated -m32 -fpermissive 
    33LIB_PATH=../lib 
    44COMMON_PATH=../common 
    … …  
    66 
    77 
    8 kor: main.cc corr.o corlist.o cmdline.o word.o auttools.o cmdline.c common_cor.o common.o  
     8kor: main.cc corr.o corlist.o cmdline.o $(LIB_PATH)/word.o \ 
     9        $(LIB_PATH)/auttools.o cmdline.c common_cor.o common.o  
    910        g++ $(PAR) -D _CMDLINE_FILE=$(CMDLINE_FILE) main.cc corlist.o corr.o common.o \ 
    1011        $(LIB_PATH)/word.o $(LIB_PATH)/auttools.o cmdline.c common_cor.o \ 
    1112        -o kor 
    1213 
    13 corr.o: corr.cc corr.h cmdline.h 
     14corr.o: corr.cc corr.hh cmdline.h 
    1415        g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corr.cc 
    1516         
    1617corlist.o: corlist.cc corlist.h cmdline.h 
    17         g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corlist.cc  
     18        g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corlist.cc 
     19         
    1820 
    19 common.o: cmdline.h $(COMMON_PATH)/cmdline_common.ggo cmdline_common 
     21 
     22common.o: cmdline.h $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \ 
     23         $(COMMON_PATH)/common.h 
    2024        g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc 
    2125 
    … …  
    4145        rm cmdline.* || true 
    4246 
    43 include $(COMMON_PATH)/common.mk 
    44 include $(LIB_PATH)/lib.mk 

  • _old/app/src/kor/corlist.cc

    r1e121f4 ra6e708f  
    1 #include <cstdio> 
    2 //#include <alloc.h> 
     1#include <stdio.h> 
     2#include <malloc.h> 
    33#include "corlist.h" 
    44 
    55#define min(x,y) ((x<y)?(x):(y)) 
    66 
    7 using namespace std; 
    87 
    98Weight CorList::GetValue(char X[100], char Y[100], Weight (*H2)[100], int i, int j) 

  • _old/app/src/kor/corr.cc

    r1e121f4 ra6e708f  
    11//--------------------------------------------------------------------------- 
    22#include "common_cor.h" 
    3 #include "corr.h" 
     3#include "corr.hh" 
    44 
    55#define MAXPATH 256 

  • _old/app/src/kor/main.cc

    r1e121f4 ra6e708f  
    33#include "../lib/iotools.h" 
    44#include "common_cor.h" 
    5 #include "corr.h" 
     5#include "corr.hh" 
    66#include <locale.h> 
    77 
Note: See TracChangeset for help on using the changeset viewer.