EST_Relation_mls.h (speech_tools-2.4-release) | : | EST_Relation_mls.h (speech_tools-2.5.0-release) | ||
---|---|---|---|---|
skipping to change at line 40 | skipping to change at line 40 | |||
/*************************************************************************/ | /*************************************************************************/ | |||
/* Author : Alan W Black */ | /* Author : Alan W Black */ | |||
/* Date : February 1998 */ | /* Date : February 1998 */ | |||
/* --------------------------------------------------------------------- */ | /* --------------------------------------------------------------------- */ | |||
/* Functions for Multi-linear structure relations */ | /* Functions for Multi-linear structure relations */ | |||
/* */ | /* */ | |||
/*************************************************************************/ | /*************************************************************************/ | |||
#ifndef __EST_RELATION_MLS_H__ | #ifndef __EST_RELATION_MLS_H__ | |||
#define __EST_RELATION_MLS_H__ | #define __EST_RELATION_MLS_H__ | |||
inline EST_Item *link1(EST_Item *n) { return n->down()->down()->down(); } | inline EST_Item *link1(EST_Item *n) { return idown(idown(idown(n))); } | |||
inline EST_Item *link2(EST_Item *n) | inline EST_Item *link2(EST_Item *n) { return idown(inext(idown(idown(n)))); } | |||
{ return n->down()->down()->next()->down(); } | inline EST_Item *linkn(EST_Item *n) { return idown(last(idown(idown(n)))); } | |||
inline EST_Item *linkn(EST_Item *n) | ||||
{ return n->down()->down()->last()->down(); } | ||||
EST_Item *link(int l,EST_Item *n); | EST_Item *link(int l,EST_Item *n); | |||
inline EST_Item *linkedfrom(EST_Item *n) | inline EST_Item *linkedfrom(EST_Item *n) { return iup(iup(first(iup(n)))); } | |||
{ return n->up()->first()->up()->up(); } | ||||
int linked(EST_Item *from, EST_Item *to); | int linked(EST_Item *from, EST_Item *to); | |||
inline EST_Item *next_link(EST_Item *n) { return n->up()->next()->down(); } | inline EST_Item *next_link(EST_Item *n) { return idown(inext(iup(n))); } | |||
void add_link(EST_Item *from, EST_Item *to); | void add_link(EST_Item *from, EST_Item *to); | |||
void remove_link(EST_Item *from, EST_Item *to); | void remove_link(EST_Item *from, EST_Item *to); | |||
#endif | #endif | |||
End of changes. 3 change blocks. | ||||
8 lines changed or deleted | 6 lines changed or added |