View | Details | Raw Unified
Collapse All | Expand All

(-) speech_tools.gcc34/include/EST_Chunk.h (+2 lines)
 Lines 105-110   using namespace std; Link Here  
 /*                                                                      */
 /*                                                                      */
 /************************************************************************/
 /************************************************************************/

            

              
              
class EST_ChunkPtr;

            

            

              
              

            

        
class EST_Chunk  {
class EST_Chunk  {

        
  public:
  public:

        
    typedef  unsigned short use_counter;
    typedef  unsigned short use_counter;



(-) speech_tools.gcc34/include/EST_simplestats.h
      (-6 / +6 lines)




  

    

    

       Lines 260-276
      public: 
    
  Link Here 
    

  

        
    /// 
    /// 

        
    double frequency(const int i) const; 
    double frequency(const int i) const; 

        
    /// Used for iterating through members of the distribution
    /// Used for iterating through members of the distribution

            

              
    int item_start() const;

              
    size_t item_start() const;

            

        
    /// Used for iterating through members of the distribution
    /// Used for iterating through members of the distribution

            

              
    int item_next(int idx) const;

              
    size_t item_next(size_t idx) const;

            

        
    /// Used for iterating through members of the distribution
    /// Used for iterating through members of the distribution

            

              
    int item_end(int idx) const;

              
    size_t item_end(size_t idx) const;

            

        
    /// During iteration ruturns name given index 
    /// During iteration ruturns name given index 

            

              
    const EST_String &item_name(int idx) const;

              
    const EST_String &item_name(size_t idx) const;

            

        
    /// During iteration ruturns name and frequency given index  
    /// During iteration ruturns name and frequency given index  

            

              
    void item_freq(int idx,EST_String &s,double &freq) const;

              
    void item_freq(size_t idx,EST_String &s,double &freq) const;

            

        
    /// During iteration ruturns name and probability given index
    /// During iteration ruturns name and probability given index

            

              
    void item_prob(int idx,EST_String &s,double &prob) const;

              
    void item_prob(size_t idx,EST_String &s,double &prob) const;

            

        

        
    /// Returns discrete vocabilary of distribution
    /// Returns discrete vocabilary of distribution

        
    inline const EST_Discrete *const get_discrete() const { return discrete; };
    inline const EST_Discrete *const get_discrete() const { return discrete; };



(-) speech_tools.gcc34/ling_class/item_feats.cc
      (-1 / +1 lines)




  

    

    

       Lines 78-84
      EST_String get_featname(const EST_Item_f 
    
  Link Here 
    

  

        
   EST_String name = EST_FeatureFunctionContext::global->get_featfunc_name(func, found);
   EST_String name = EST_FeatureFunctionContext::global->get_featfunc_name(func, found);

        

        
   if (!found)
   if (!found)

            

              
	EST_error("featfunc 0x%x has no name", (int)func);

              
	EST_error("featfunc 0x%x has no name", func);

            

        

        
    return name;
    return name;

        
}
}



(-) speech_tools.gcc34/siod/siod_est.cc
      (-1 / +1 lines)




  

    

    

       Lines 52-58
       
    
  Link Here 
    

  

        
#include "EST_Track.h"
#include "EST_Track.h"

        
#include "EST_track_aux.h"
#include "EST_track_aux.h"

        

            

              
Declare_TStringHash_Base(LISP,NIL,NIL)

              
Declare_TStringHash_Base(LISP,(LISP)0,NIL)

            

        

        
#if defined(INSTANTIATE_TEMPLATES)
#if defined(INSTANTIATE_TEMPLATES)

        
#include "../base_class/EST_THash.cc"
#include "../base_class/EST_THash.cc"



(-) speech_tools.gcc34/stats/EST_DProbDist.cc
      (-9 / +9 lines)




  

    

    

       Lines 305-319
      double EST_DiscreteProbDistribution::ent 
    
  Link Here 
    

  

        
}
}

        

        
//  For iterating through members of a probability distribution
//  For iterating through members of a probability distribution

            

              
int EST_DiscreteProbDistribution::item_start(void) const

              
size_t EST_DiscreteProbDistribution::item_start(void) const

            

        
{
{

        
    if (type == tprob_discrete)
    if (type == tprob_discrete)

        
	return 0;
	return 0;

        
    else
    else

            

              
	return (int)scounts.list.head();

              
	return (size_t)scounts.list.head();

            

        
}
}

        

            

              
int EST_DiscreteProbDistribution::item_end(int idx) const

              
size_t EST_DiscreteProbDistribution::item_end(size_t idx) const

            

        
{
{

        
    if (type == tprob_discrete)
    if (type == tprob_discrete)

        
	return (idx >= icounts.length());
	return (idx >= icounts.length());

  

    

    

       Lines 321-335
      int EST_DiscreteProbDistribution::item_e 
    
  Link Here 
    

  

        
	return ((EST_Litem *)idx == 0);
	return ((EST_Litem *)idx == 0);

        
}
}

        

            

              
int EST_DiscreteProbDistribution::item_next(int idx) const

              
size_t EST_DiscreteProbDistribution::item_next(size_t idx) const

            

        
{
{

        
    if (type == tprob_discrete)
    if (type == tprob_discrete)

        
	return ++idx;
	return ++idx;

        
    else
    else

            

              
	return (int)next((EST_Litem *)idx);

              
	return (size_t)next((EST_Litem *)idx);

            

        
}
}

        

            

              
const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const

              
const EST_String &EST_DiscreteProbDistribution::item_name(size_t idx) const

            

        
{
{

        
    if (type == tprob_discrete)
    if (type == tprob_discrete)

        
	return discrete->name(idx);
	return discrete->name(idx);

  

    

    

       Lines 337-343
      const EST_String &EST_DiscreteProbDistri 
    
  Link Here 
    

  

        
	return scounts.list((EST_Litem *)idx).k;
	return scounts.list((EST_Litem *)idx).k;

        
}
}

        

            

              
void EST_DiscreteProbDistribution::item_freq(int idx,EST_String &s,double &freq) const

              
void EST_DiscreteProbDistribution::item_freq(size_t idx,EST_String &s,double &freq) const

            

        
{
{

        
    if (type == tprob_discrete)
    if (type == tprob_discrete)

        
    {
    {

  

    

    

       Lines 351-357
      void EST_DiscreteProbDistribution::item_ 
    
  Link Here 
    

  

        
    }
    }

        
}
}

        

            

              
void EST_DiscreteProbDistribution::item_prob(int idx,EST_String &s,double &prob) const

              
void EST_DiscreteProbDistribution::item_prob(size_t idx,EST_String &s,double &prob) const

            

        
{
{

        
    if (type == tprob_discrete)
    if (type == tprob_discrete)

        
    {
    {

  

    

    

       Lines 368-374
      void EST_DiscreteProbDistribution::item_ 
    
  Link Here 
    

  

        
ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)
ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)

        
{
{

        
    // Output best with probabilities
    // Output best with probabilities

            

              
    int i;

              
    size_t i;

            

        
    double prob;
    double prob;

        
    double sum=0;
    double sum=0;

        
    EST_String name;
    EST_String name;