#include <Diff3.hpp>

Collaboration diagram for dtl::Diff3< elem, sequence, comparator >:

Public Member Functions
	Diff3 ()

	Diff3 (const sequence &a, const sequence &b, const sequence &c)

	~Diff3 ()

bool	isConflict () const

sequence	getMergedSequence () const

bool	merge ()

void	compose ()

Private Member Functions
	dtl_typedefs (elem, sequence) sequence A

sequence	merge_ ()

void	joinElemVec (elemVec &s1, elemVec &s2) const

template<typename T_iter >
bool	isEnd (const T_iter &end, const T_iter &it) const

template<typename T_iter >
void	forwardUntilEnd (const T_iter &end, T_iter &it) const

void	addDecentSequence (const sesElemVec_iter &end, sesElemVec_iter &it, elemVec &seq) const

Private Attributes
sequence	B

sequence	C

sequence	S

Diff< elem, sequence, comparator >	diff_ba

Diff< elem, sequence, comparator >	diff_bc

bool	conflict

elem	csepabegin

elem	csepa

elem	csepaend

Detailed Description

template<typename elem, typename sequence = vector< elem >, typename comparator = Compare< elem >>
class dtl::Diff3< elem, sequence, comparator >

diff3 class template sequence must support random_access_iterator.

Definition at line 48 of file Diff3.hpp.

Constructor & Destructor Documentation

◆ Diff3() [1/2]

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

dtl::Diff3< elem, sequence, comparator >::Diff3 ( )

inline

Definition at line 63 of file Diff3.hpp.

◆ Diff3() [2/2]

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

dtl::Diff3< elem, sequence, comparator >::Diff3	(	const sequence &	a,
		const sequence &	b,
		const sequence &	c
	)

inline

Definition at line 64 of file Diff3.hpp.

◆ ~Diff3()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

dtl::Diff3< elem, sequence, comparator >::~Diff3 ( )

inline

Definition at line 70 of file Diff3.hpp.

Member Function Documentation

◆ addDecentSequence()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

void dtl::Diff3< elem, sequence, comparator >::addDecentSequence	(	const sesElemVec_iter &	end,
		sesElemVec_iter &	it,
		elemVec &	seq
	)		const

inlineprivate

add elements whose SES's type is ADD

Definition at line 235 of file Diff3.hpp.

References dtl::Diff3< elem, sequence, comparator >::isEnd(), and dtl::SES_ADD.

Referenced by dtl::Diff3< elem, sequence, comparator >::merge_().

Here is the call graph for this function:

◆ compose()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

void dtl::Diff3< elem, sequence, comparator >::compose ( )

inline

compose differences

Definition at line 108 of file Diff3.hpp.

References dtl::Diff3< elem, sequence, comparator >::diff_ba, and dtl::Diff3< elem, sequence, comparator >::diff_bc.

◆ dtl_typedefs()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

dtl::Diff3< elem, sequence, comparator >::dtl_typedefs	(	elem	,
		sequence
	)

private

◆ forwardUntilEnd()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

template<typename T_iter >

void dtl::Diff3< elem, sequence, comparator >::forwardUntilEnd	(	const T_iter &	end,
		T_iter &	it
	)		const

inlineprivate

increment iterator until iterator is at end

Definition at line 228 of file Diff3.hpp.

References dtl::Diff3< elem, sequence, comparator >::isEnd().

Referenced by dtl::Diff3< elem, sequence, comparator >::merge_().

Here is the call graph for this function:

◆ getMergedSequence()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

sequence dtl::Diff3< elem, sequence, comparator >::getMergedSequence ( ) const

inline

Definition at line 76 of file Diff3.hpp.

References dtl::Diff3< elem, sequence, comparator >::S.

◆ isConflict()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

bool dtl::Diff3< elem, sequence, comparator >::isConflict ( ) const

inline

Definition at line 72 of file Diff3.hpp.

References dtl::Diff3< elem, sequence, comparator >::conflict.

Referenced by dtl::Diff3< elem, sequence, comparator >::merge().

◆ isEnd()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

template<typename T_iter >

bool dtl::Diff3< elem, sequence, comparator >::isEnd	(	const T_iter &	end,
		const T_iter &	it
	)		const

inlineprivate

check if sequence is at end

Definition at line 220 of file Diff3.hpp.

Referenced by dtl::Diff3< elem, sequence, comparator >::addDecentSequence(), dtl::Diff3< elem, sequence, comparator >::forwardUntilEnd(), and dtl::Diff3< elem, sequence, comparator >::merge_().

◆ joinElemVec()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

void dtl::Diff3< elem, sequence, comparator >::joinElemVec	(	elemVec &	s1,
		elemVec &	s2
	)		const

inlineprivate

join elem vectors

Definition at line 208 of file Diff3.hpp.

◆ merge()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

bool dtl::Diff3< elem, sequence, comparator >::merge ( )

inline

merge changes B and C into A

Definition at line 83 of file Diff3.hpp.

References dtl::Diff3< elem, sequence, comparator >::B, dtl::Diff3< elem, sequence, comparator >::C, dtl::Diff3< elem, sequence, comparator >::diff_ba, dtl::Diff3< elem, sequence, comparator >::diff_bc, dtl::Diff3< elem, sequence, comparator >::isConflict(), dtl::Diff3< elem, sequence, comparator >::merge_(), and dtl::Diff3< elem, sequence, comparator >::S.

Here is the call graph for this function:

◆ merge_()

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

sequence dtl::Diff3< elem, sequence, comparator >::merge_ ( )

inlineprivate

merge implementation

Definition at line 117 of file Diff3.hpp.

References dtl::Diff3< elem, sequence, comparator >::addDecentSequence(), dtl::Diff3< elem, sequence, comparator >::B, dtl::Diff3< elem, sequence, comparator >::conflict, dtl::Diff3< elem, sequence, comparator >::diff_ba, dtl::Diff3< elem, sequence, comparator >::diff_bc, dtl::Diff3< elem, sequence, comparator >::forwardUntilEnd(), dtl::Ses< elem >::getSequence(), dtl::Diff3< elem, sequence, comparator >::isEnd(), dtl::SES_ADD, dtl::SES_COMMON, and dtl::SES_DELETE.

Referenced by dtl::Diff3< elem, sequence, comparator >::merge().

Here is the call graph for this function:

Member Data Documentation

◆ B

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

sequence dtl::Diff3< elem, sequence, comparator >::B

private

Definition at line 53 of file Diff3.hpp.

Referenced by dtl::Diff3< elem, sequence, comparator >::merge(), and dtl::Diff3< elem, sequence, comparator >::merge_().

◆ C

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

sequence dtl::Diff3< elem, sequence, comparator >::C

private

Definition at line 54 of file Diff3.hpp.

Referenced by dtl::Diff3< elem, sequence, comparator >::merge().

◆ conflict

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

bool dtl::Diff3< elem, sequence, comparator >::conflict

private

Definition at line 58 of file Diff3.hpp.

Referenced by dtl::Diff3< elem, sequence, comparator >::isConflict(), and dtl::Diff3< elem, sequence, comparator >::merge_().

◆ csepa

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

elem dtl::Diff3< elem, sequence, comparator >::csepa

private

Definition at line 60 of file Diff3.hpp.

◆ csepabegin

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

elem dtl::Diff3< elem, sequence, comparator >::csepabegin

private

Definition at line 59 of file Diff3.hpp.

◆ csepaend

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

elem dtl::Diff3< elem, sequence, comparator >::csepaend

private

Definition at line 61 of file Diff3.hpp.

◆ diff_ba

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

Diff< elem, sequence, comparator > dtl::Diff3< elem, sequence, comparator >::diff_ba

private

Definition at line 56 of file Diff3.hpp.

Referenced by dtl::Diff3< elem, sequence, comparator >::compose(), dtl::Diff3< elem, sequence, comparator >::merge(), and dtl::Diff3< elem, sequence, comparator >::merge_().

◆ diff_bc

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

Diff< elem, sequence, comparator > dtl::Diff3< elem, sequence, comparator >::diff_bc

private

Definition at line 57 of file Diff3.hpp.

Referenced by dtl::Diff3< elem, sequence, comparator >::compose(), dtl::Diff3< elem, sequence, comparator >::merge(), and dtl::Diff3< elem, sequence, comparator >::merge_().

◆ S

template<typename elem , typename sequence = vector< elem >, typename comparator = Compare< elem >>

sequence dtl::Diff3< elem, sequence, comparator >::S

private

Definition at line 55 of file Diff3.hpp.

Referenced by dtl::Diff3< elem, sequence, comparator >::getMergedSequence(), and dtl::Diff3< elem, sequence, comparator >::merge().

The documentation for this class was generated from the following file:

D:/CPP/numere-source/trunk/common/dtl/Diff3.hpp

Public Member Functions

Private Member Functions

Private Attributes

Detailed Description

Constructor & Destructor Documentation

◆ Diff3() [1/2]

◆ Diff3() [2/2]

◆ ~Diff3()

Member Function Documentation

◆ addDecentSequence()

◆ compose()

◆ dtl_typedefs()

◆ forwardUntilEnd()

◆ getMergedSequence()

◆ isConflict()

◆ isEnd()

◆ joinElemVec()

◆ merge()

◆ merge_()

Member Data Documentation

◆ B

◆ C

◆ conflict

◆ csepa

◆ csepabegin

◆ csepaend

◆ diff_ba

◆ diff_bc

◆ S