Skip to content

Htk3.5 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sih4sing5hong5 wants to merge 2 commits into
base: htk
Choose a base branch
from
Open

Htk3.5 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67cf34
HTK-3.5.beta-1
sih4sing5hong5 Jul 4, 2018
42821a6
HTK-3.5.beta-2
sih4sing5hong5 Jul 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions HLMLib/.directory
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions HLMLib/ChangeLog
View file
Open in desktop

This file was deleted.

27 changes: 15 additions & 12 deletions HLMLib/LCMap.c
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,36 @@
/* ___ */
/* |_| | |_/ SPEECH */
/* | | | | \ RECOGNITION */
/* ========= SOFTWARE */
/* ========= SOFTWARE */
/* */
/* */
/* ----------------------------------------------------------- */
/* developed at: */
/* */
/* Speech Vision and Robotics group */
/* Cambridge University Engineering Department */
/* http://svr-www.eng.cam.ac.uk/ */
/* Speech Vision and Robotics group */
/* (now Machine Intelligence Laboratory) */
/* Cambridge University Engineering Department */
/* http://mi.eng.cam.ac.uk/ */
/* */
/* main authors: Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* ----------------------------------------------------------- */
/* Copyright: */
/* main authors: */
/* Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* */
/* 1994-2002 Cambridge University */
/* Engineering Department */
/* ----------------------------------------------------------- */
/* Copyright: Cambridge University */
/* Engineering Department */
/* 1994-2015 Cambridge, Cambridgeshire UK */
/* http://www.eng.cam.ac.uk */
/* */
/* Use of this software is governed by a License Agreement */
/* ** See the file License for the Conditions of Use ** */
/* ** This banner notice must not be removed ** */
/* */
/* ----------------------------------------------------------- */
/* File: LCMap: Class Map Routines */
/* File: LCMap Class map routines */
/* ----------------------------------------------------------- */

char *lcmap_version = "!HVER!LCMap: 3.4.1 [CUED 12/03/09]";
char *lcmap_version = "!HVER!LCMap: 3.5.0 [CUED 12/10/15]";
char *lcmap_vc_id = "$Id: LCMap.c,v 1.1.1.1 2006/10/11 09:54:43 jal58 Exp $";

#include "HShell.h"
Expand Down
32 changes: 19 additions & 13 deletions HLMLib/LCMap.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,36 @@
/* ___ */
/* |_| | |_/ SPEECH */
/* | | | | \ RECOGNITION */
/* ========= SOFTWARE */
/* ========= SOFTWARE */
/* */
/* */
/* ----------------------------------------------------------- */
/* developed at: */
/* */
/* Speech Vision and Robotics group */
/* Cambridge University Engineering Department */
/* http://svr-www.eng.cam.ac.uk/ */
/* Speech Vision and Robotics group */
/* (now Machine Intelligence Laboratory) */
/* Cambridge University Engineering Department */
/* http://mi.eng.cam.ac.uk/ */
/* */
/* main authors: Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* ----------------------------------------------------------- */
/* Copyright: */
/* main authors: */
/* Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* */
/* 1994-2002 Cambridge University */
/* Engineering Department */
/* ----------------------------------------------------------- */
/* Copyright: Cambridge University */
/* Engineering Department */
/* 1994-2015 Cambridge, Cambridgeshire UK */
/* http://www.eng.cam.ac.uk */
/* */
/* Use of this software is governed by a License Agreement */
/* ** See the file License for the Conditions of Use ** */
/* ** This banner notice must not be removed ** */
/* */
/* ----------------------------------------------------------- */
/* File: LCMap: Class Map and Associated Routines */
/* File: LCMap Class map and associated routines */
/* ----------------------------------------------------------- */

/* !HVER!lcmap: 3.4.1 [CUED 12/03/09] */
/* !HVER!LCMap: 3.5.0 [CUED 12/10/15] */

#ifndef _LCMAP_H
#define _LCMAP_H
Expand Down Expand Up @@ -153,10 +156,13 @@ ClassEntry *GetWordClassEntry(ClassMap *c, int wdndx);
not found.
*/

/* -------------------- End of LCMap.h ---------------------- */

#ifdef __cplusplus
}
#endif

#endif

/* -------------------- End of LCMap.h ---------------------- */


27 changes: 15 additions & 12 deletions HLMLib/LGBase.c
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,36 @@
/* ___ */
/* |_| | |_/ SPEECH */
/* | | | | \ RECOGNITION */
/* ========= SOFTWARE */
/* ========= SOFTWARE */
/* */
/* */
/* ----------------------------------------------------------- */
/* developed at: */
/* */
/* Speech Vision and Robotics group */
/* Cambridge University Engineering Department */
/* http://svr-www.eng.cam.ac.uk/ */
/* Speech Vision and Robotics group */
/* (now Machine Intelligence Laboratory) */
/* Cambridge University Engineering Department */
/* http://mi.eng.cam.ac.uk/ */
/* */
/* main authors: Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* ----------------------------------------------------------- */
/* Copyright: */
/* main authors: */
/* Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* */
/* 1994-2002 Cambridge University */
/* Engineering Department */
/* ----------------------------------------------------------- */
/* Copyright: Cambridge University */
/* Engineering Department */
/* 1994-2015 Cambridge, Cambridgeshire UK */
/* http://www.eng.cam.ac.uk */
/* */
/* Use of this software is governed by a License Agreement */
/* ** See the file License for the Conditions of Use ** */
/* ** This banner notice must not be removed ** */
/* */
/* ----------------------------------------------------------- */
/* File: LGBase: Gram File Database Routines */
/* File: LGBase Gram file database routines */
/* ----------------------------------------------------------- */

char *lgbase_version = "!HVER!LGBase: 3.4.1 [CUED 12/03/09]";
char *lgbase_version = "!HVER!LGBase: 3.5.0 [CUED 12/10/15]";
char *lgbase_vc_id = "$Id: LGBase.c,v 1.1.1.1 2006/10/11 09:54:43 jal58 Exp $";

#include "HShell.h"
Expand Down
32 changes: 19 additions & 13 deletions HLMLib/LGBase.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,36 @@
/* ___ */
/* |_| | |_/ SPEECH */
/* | | | | \ RECOGNITION */
/* ========= SOFTWARE */
/* ========= SOFTWARE */
/* */
/* */
/* ----------------------------------------------------------- */
/* developed at: */
/* */
/* Speech Vision and Robotics group */
/* Cambridge University Engineering Department */
/* http://svr-www.eng.cam.ac.uk/ */
/* Speech Vision and Robotics group */
/* (now Machine Intelligence Laboratory) */
/* Cambridge University Engineering Department */
/* http://mi.eng.cam.ac.uk/ */
/* */
/* main authors: Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* ----------------------------------------------------------- */
/* Copyright: */
/* main authors: */
/* Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* */
/* 1994-2002 Cambridge University */
/* Engineering Department */
/* ----------------------------------------------------------- */
/* Copyright: Cambridge University */
/* Engineering Department */
/* 1994-2015 Cambridge, Cambridgeshire UK */
/* http://www.eng.cam.ac.uk */
/* */
/* Use of this software is governed by a License Agreement */
/* ** See the file License for the Conditions of Use ** */
/* ** This banner notice must not be removed ** */
/* */
/* ----------------------------------------------------------- */
/* File: LGBase: Gram File Database Routines */
/* File: LGBase Gram file database routines */
/* ----------------------------------------------------------- */

/* !HVER!lgbase: 3.4.1 [CUED 12/03/09] */
/* !HVER!LGBase: 3.5.0 [CUED 12/10/15] */

#ifndef _LGBASE_H_
#define _LGBASE_H_
Expand Down Expand Up @@ -263,10 +266,13 @@ FoFTab *ReadFoFTab(MemHeap *mem, char *fn);
Create a FoF table holding contents of file fn
*/

/* -------------------- End of LGBase.h ---------------------- */

#ifdef __cplusplus
}
#endif

#endif


/* -------------------- End of LGBase.h ---------------------- */

40 changes: 21 additions & 19 deletions HLMLib/LModel.c
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,37 @@
/* ___ */
/* |_| | |_/ SPEECH */
/* | | | | \ RECOGNITION */
/* ========= SOFTWARE */
/* ========= SOFTWARE */
/* */
/* */
/* ----------------------------------------------------------- */
/* developed at: */
/* */
/* Speech Vision and Robotics group */
/* Cambridge University Engineering Department */
/* http://svr-www.eng.cam.ac.uk/ */
/* Speech Vision and Robotics group */
/* (now Machine Intelligence Laboratory) */
/* Cambridge University Engineering Department */
/* http://mi.eng.cam.ac.uk/ */
/* */
/* main authors: Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* ----------------------------------------------------------- */
/* Copyright: */
/* main authors: */
/* Valtcho Valtchev, Steve Young, */
/* Julian Odell, Gareth Moore */
/* */
/* 1994-2002 Cambridge University */
/* Engineering Department */
/* ----------------------------------------------------------- */
/* Copyright: Cambridge University */
/* Engineering Department */
/* 1994-2015 Cambridge, Cambridgeshire UK */
/* http://www.eng.cam.ac.uk */
/* */
/* Use of this software is governed by a License Agreement */
/* ** See the file License for the Conditions of Use ** */
/* ** This banner notice must not be removed ** */
/* */
/* ----------------------------------------------------------- */
/* File: LModel: ARPA style LM handling */
/* File: LModel ARPA style LM handling */
/* ----------------------------------------------------------- */


char *lmodel_version = "!HVER!LModel: 3.4.1 [CUED 12/03/09]";
char *lmodel_version = "!HVER!LModel: 3.5.0 [CUED 12/10/15]";
char *lmodel_vc_id = "$Id: LModel.c,v 1.1.1.1 2006/10/11 09:54:43 jal58 Exp $";


Expand Down Expand Up @@ -796,7 +799,7 @@ static int LoadNGram(Source *src, int nSize, BackOffLM *lm, int *itran)
LM_Id ndx=0;
NGramInfo *gi;
LMProbType ptype;
Byte fsize, flags;
Byte flags;
SMEntry *se=NULL;
FLEntry *feptr=NULL, *fe=NULL;
float prob,bowt,scale;
Expand Down Expand Up @@ -828,7 +831,6 @@ static int LoadNGram(Source *src, int nSize, BackOffLM *lm, int *itran)
for (i=0; i<lm->gInfo[nSize].nEntry; i++) {
has_bowt = FALSE; hasOOV = FALSE;
if (isBin) { /* binary model */
fsize = (Byte) GetCh(src);
flags = (Byte) GetCh(src);
READ_FLOAT(src,&prob,TRUE);
for (j=0; j<nSize; j++) {
Expand Down Expand Up @@ -942,9 +944,9 @@ static int LoadNGram(Source *src, int nSize, BackOffLM *lm, int *itran)
}
*/
if (trace&T_LOAD) {
printf(" SMEntry: %8d x %2d bytes = %d bytes\n",
printf(" SMEntry: %8d x %2ld bytes = %ld bytes\n",
num_se, sizeof(SMEntry), num_se*sizeof(SMEntry));
printf(" FLEntry: %8d x %2d bytes = %d bytes\n",
printf(" FLEntry: %8d x %2ld bytes = %ld bytes\n",
num_fe, sizeof(FLEntry), num_fe*sizeof(FLEntry));
}
lm->gInfo[0].nEntry+=num_fe;
Expand Down Expand Up @@ -1186,7 +1188,7 @@ static void ReadClassCounts(Source *src, int nWords, BackOffLM *lm)

nid2 = GetNameId(lm->htab, ptr, TRUE); /* Get name id of class */
class_id = atoi(ptr+5) - 1; /* assume called CLASSn */ /* GLM */
nid2->ptr = (void*) class_id;
nid2->ptr = (void*) (unsigned long int)class_id;

ptr = ptr2 + 1; /* Pass over NULL */
ptr += strspn(ptr, " \t"); /* Skip over whitespace */
Expand Down Expand Up @@ -1242,7 +1244,7 @@ static void CountClassTotals(BackOffLM *lm)
word_id = ((WordProb*)(lm->classBM[i+1]->ptr))->id;
if (word_id!=i) HError(15490, "CountClassTotals: Inconsistent word ids found");

class_id = (int)(((WordProb*)(lm->classBM[i+1]->ptr))->class->ptr);
class_id = (int)(unsigned long int)(((WordProb*)(lm->classBM[i+1]->ptr))->class->ptr);
lm->totals[class_id] += lm->word[i];
}
}
Expand All @@ -1257,7 +1259,7 @@ static void CalcWordClassProbs(BackOffLM *lm)

/* For each word */
for (i=0; i<lm->classW; i++) {
class_id = (int)(((WordProb*)(lm->classBM[i+1]->ptr))->class->ptr);
class_id = (int)(unsigned long int)(((WordProb*)(lm->classBM[i+1]->ptr))->class->ptr);
prob = (((double)(lm->word[i]))) / ((double)(lm->totals[class_id]));
((WordProb*)(lm->classBM[i+1]->ptr))->prob = LOG_NATURAL(prob);
}
Expand Down
Loading