Attachment #75084 for bug #116030

Lines 105-110 using namespace std; Link Here

(-)speech_tools.gcc34/include/EST_Chunk.h (+2 lines)
105	/* */	105	/* */
106	/************************************************************************/	106	/************************************************************************/
107		107
		108	class EST_ChunkPtr;
		109
108	class EST_Chunk {	110	class EST_Chunk {
109	public:	111	public:
110	typedef unsigned short use_counter;	112	typedef unsigned short use_counter;




    /// 
    double frequency(const int i) const; 
    /// Used for iterating through members of the distribution
    size_t item_start() const;
    /// Used for iterating through members of the distribution
    size_t item_next(size_t idx) const;
    /// Used for iterating through members of the distribution
    size_t item_end(size_t idx) const;
    /// During iteration ruturns name given index 
    const EST_String &item_name(size_t idx) const;
    /// During iteration ruturns name and frequency given index  
    void item_freq(size_t idx,EST_String &s,double &freq) const;
    /// During iteration ruturns name and probability given index
    void item_prob(size_t idx,EST_String &s,double &prob) const;

    /// Returns discrete vocabilary of distribution
    inline const EST_Discrete *const get_discrete() const { return discrete; };

Lines 78-84 EST_String get_featname(const EST_Item_f Link Here

(-)speech_tools.gcc34/ling_class/item_feats.cc (-1 / +1 lines)
78	EST_String name = EST_FeatureFunctionContext::global->get_featfunc_name(func, found);	78	EST_String name = EST_FeatureFunctionContext::global->get_featfunc_name(func, found);
79		79
80	if (!found)	80	if (!found)
81	EST_error("featfunc 0x%x has no name", (int)func);	81	EST_error("featfunc 0x%x has no name", func);
82		82
83	return name;	83	return name;
84	}	84	}

Lines 52-58 Link Here

(-)speech_tools.gcc34/siod/siod_est.cc (-1 / +1 lines)
52	#include "EST_Track.h"	52	#include "EST_Track.h"
53	#include "EST_track_aux.h"	53	#include "EST_track_aux.h"
54		54
55	Declare_TStringHash_Base(LISP,NIL,NIL)	55	Declare_TStringHash_Base(LISP,(LISP)0,NIL)
56		56
57	#if defined(INSTANTIATE_TEMPLATES)	57	#if defined(INSTANTIATE_TEMPLATES)
58	#include "../base_class/EST_THash.cc"	58	#include "../base_class/EST_THash.cc"




}

//  For iterating through members of a probability distribution
size_t EST_DiscreteProbDistribution::item_start(void) const
{
    if (type == tprob_discrete)
	return 0;
    else
	return (size_t)scounts.list.head();
}

size_t EST_DiscreteProbDistribution::item_end(size_t idx) const
{
    if (type == tprob_discrete)
	return (idx >= icounts.length());

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

size_t EST_DiscreteProbDistribution::item_next(size_t idx) const
{
    if (type == tprob_discrete)
	return ++idx;
    else
	return (size_t)next((EST_Litem *)idx);
}

const EST_String &EST_DiscreteProbDistribution::item_name(size_t idx) const
{
    if (type == tprob_discrete)
	return discrete->name(idx);

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

void EST_DiscreteProbDistribution::item_freq(size_t idx,EST_String &s,double &freq) const
{
    if (type == tprob_discrete)
    {

    }
}

void EST_DiscreteProbDistribution::item_prob(size_t idx,EST_String &s,double &prob) const
{
    if (type == tprob_discrete)
    {

ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)
{
    // Output best with probabilities
    size_t i;
    double prob;
    double sum=0;
    EST_String name;

Return to bug 116030

Lines 305-319 double EST_DiscreteProbDistribution::ent Link Here

(-)speech_tools.gcc34/stats/EST_DProbDist.cc (-9 / +9 lines)
305	}	305	}
306		306
307	// For iterating through members of a probability distribution	307	// For iterating through members of a probability distribution
308	int EST_DiscreteProbDistribution::item_start(void) const	308	size_t EST_DiscreteProbDistribution::item_start(void) const
309	{	309	{
310	if (type == tprob_discrete)	310	if (type == tprob_discrete)
311	return 0;	311	return 0;
312	else	312	else
313	return (int)scounts.list.head();	313	return (size_t)scounts.list.head();
314	}	314	}
315		315
316	int EST_DiscreteProbDistribution::item_end(int idx) const	316	size_t EST_DiscreteProbDistribution::item_end(size_t idx) const
317	{	317	{
318	if (type == tprob_discrete)	318	if (type == tprob_discrete)
319	return (idx >= icounts.length());	319	return (idx >= icounts.length());
Lines 321-335 int EST_DiscreteProbDistribution::item_e Link Here
321	return ((EST_Litem *)idx == 0);	321	return ((EST_Litem *)idx == 0);
322	}	322	}
323		323
324	int EST_DiscreteProbDistribution::item_next(int idx) const	324	size_t EST_DiscreteProbDistribution::item_next(size_t idx) const
325	{	325	{
326	if (type == tprob_discrete)	326	if (type == tprob_discrete)
327	return ++idx;	327	return ++idx;
328	else	328	else
329	return (int)next((EST_Litem *)idx);	329	return (size_t)next((EST_Litem *)idx);
330	}	330	}
331		331
332	const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const	332	const EST_String &EST_DiscreteProbDistribution::item_name(size_t idx) const
333	{	333	{
334	if (type == tprob_discrete)	334	if (type == tprob_discrete)
335	return discrete->name(idx);	335	return discrete->name(idx);
Lines 337-343 const EST_String &EST_DiscreteProbDistri Link Here
337	return scounts.list((EST_Litem *)idx).k;	337	return scounts.list((EST_Litem *)idx).k;
338	}	338	}
339		339
340	void EST_DiscreteProbDistribution::item_freq(int idx,EST_String &s,double &freq) const	340	void EST_DiscreteProbDistribution::item_freq(size_t idx,EST_String &s,double &freq) const
341	{	341	{
342	if (type == tprob_discrete)	342	if (type == tprob_discrete)
343	{	343	{
Lines 351-357 void EST_DiscreteProbDistribution::item_ Link Here
351	}	351	}
352	}	352	}
353		353
354	void EST_DiscreteProbDistribution::item_prob(int idx,EST_String &s,double &prob) const	354	void EST_DiscreteProbDistribution::item_prob(size_t idx,EST_String &s,double &prob) const
355	{	355	{
356	if (type == tprob_discrete)	356	if (type == tprob_discrete)
357	{	357	{
Lines 368-374 void EST_DiscreteProbDistribution::item_ Link Here
368	ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)	368	ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)
369	{	369	{
370	// Output best with probabilities	370	// Output best with probabilities
371	int i;	371	size_t i;
372	double prob;	372	double prob;
373	double sum=0;	373	double sum=0;
374	EST_String name;	374	EST_String name;

Lines 260-276 public: Link Here

(-)speech_tools.gcc34/include/EST_simplestats.h (-6 / +6 lines)
260	///	260	///
261	double frequency(const int i) const;	261	double frequency(const int i) const;
262	/// Used for iterating through members of the distribution	262	/// Used for iterating through members of the distribution
263	int item_start() const;	263	size_t item_start() const;
264	/// Used for iterating through members of the distribution	264	/// Used for iterating through members of the distribution
265	int item_next(int idx) const;	265	size_t item_next(size_t idx) const;
266	/// Used for iterating through members of the distribution	266	/// Used for iterating through members of the distribution
267	int item_end(int idx) const;	267	size_t item_end(size_t idx) const;
268	/// During iteration ruturns name given index	268	/// During iteration ruturns name given index
269	const EST_String &item_name(int idx) const;	269	const EST_String &item_name(size_t idx) const;
270	/// During iteration ruturns name and frequency given index	270	/// During iteration ruturns name and frequency given index
271	void item_freq(int idx,EST_String &s,double &freq) const;	271	void item_freq(size_t idx,EST_String &s,double &freq) const;
272	/// During iteration ruturns name and probability given index	272	/// During iteration ruturns name and probability given index
273	void item_prob(int idx,EST_String &s,double &prob) const;	273	void item_prob(size_t idx,EST_String &s,double &prob) const;
274		274
275	/// Returns discrete vocabilary of distribution	275	/// Returns discrete vocabilary of distribution
276	inline const EST_Discrete *const get_discrete() const { return discrete; };	276	inline const EST_Discrete *const get_discrete() const { return discrete; };