Commit731abc4

committed

Properly implement GalleyVector's ExtractValues

1 parentcc7200f commit731abc4Copy full SHA for 731abc4

File tree

+26

-19

lines changed

+26

-19

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,14 @@ class Blob`
`29`	`29`
`30`	`30`	`std::vector<char>ShiftSingleStampBin(StampBase &stmp);`
`31`	`31`	`std::stringShiftSingleStampStr(StampBase &stmp);`
	`32`	`+};`
`32`	`33`
	`34`	`+classOutOfData/An exeption. Experemental for now/`
	`35`	`+{`
`33`	`36`
`34`	`37`	`};`
`35`	`38`
`36`		`-classOutOfData/An exeption. Experemental for now/`
	`39`	`+classNotImplemented/An exeption/`
`37`	`40`	`{`
`38`	`41`
`39`	`42`	`};`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,17 +36,17 @@ class GalleyVector : public GalleyBase`
`36`	`36`	`intmaxSize()override {return -1;};/* Sereies always takes as much data as it can take*/`
`37`	`37`	`};`
`38`	`38`
`39`		`-template<classT,classStampT>classGalleyVectorV:publicGalleyVector`
	`39`	`+template<classT>classGalleyVectorV:publicGalleyVector`
`40`	`40`	`{`
`41`		`-StampT& v_stamp;`
	`41`	`+StampBaseT<T>& v_stamp;`
`42`	`42`	`public:`
`43`		`-GalleyVectorV(StampT stamp_arg): GalleyVector(stamp_arg), v_stamp(stamp_arg) {};`
	`43`	`+GalleyVectorV(StampBaseT<T> & stamp_arg): GalleyVector(stamp_arg), v_stamp(stamp_arg) {};`
`44`	`44`	`std::vector<T>ExtractValues(Blob &blob);`
`45`	`45`	`};`
`46`	`46`
`47`	`47`
`48`		`-template<classT,classStampT> std::vector<T>`
`49`		`-GalleyVectorV<T, StampT>::ExtractValues(Blob &blob)`
	`48`	`+template<classT> std::vector<T>`
	`49`	`+GalleyVectorV<T>::ExtractValues(Blob &blob)`
`50`	`50`	`{`
`51`	`51`	`std::vector<Blob> blobs =extract_internal(blob);`
`52`	`52`	`std::vector<T>res(blobs.size());`

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,18 @@ class StampBase`
`17`	`17`	`boolisVariated() {return !isFixedSize() && !isUnbounded();}`
`18`	`18`	`boolisUnbounded() {returnmaxSize() == -1;}`
`19`	`19`
`20`		`-virtual std::vector<char>ExtractBin(Blob &blob) {printf ("Not implemented");exit(1);}`
`21`		`-virtual std::stringExtractStr(Blob &blob) {printf ("Not implemented");exit(1);}`
	`20`	`+virtual std::vector<char>ExtractBin(Blob &blob) {throwNotImplemented();};`
	`21`	`+virtual std::stringExtractStr(Blob &blob) {throwNotImplemented();};`
`22`	`22`	`};`
`23`	`23`
`24`		`-classStampFixed :publicStampBase`
	`24`	`+`
	`25`	`+template<classT>classStampBaseT:publicvirtual StampBase`
	`26`	`+{`
	`27`	`+public:`
	`28`	`+virtual TExtractValue(Blob &blob) = 0;/* Shoud be defined by derived classes*/`
	`29`	`+};`
	`30`	`+`
	`31`	`+classStampFixed :publicvirtual StampBase`
`25`	`32`	`{`
`26`	`33`	`protected:`
`27`	`34`	`int size;`
`@@ -32,7 +39,7 @@ class StampFixed : public StampBase`
`32`	`39`	`std::vector<char>ExtractBin(Blob &blob)override;`
`33`	`40`	`};`
`34`	`41`
`35`		`-classStampVariated :publicStampBase`
	`42`	`+classStampVariated :publicvirtualStampBase`
`36`	`43`	`{`
`37`	`44`	`protected:`
`38`	`45`	`int min_size;`
`@@ -42,7 +49,7 @@ class StampVariated : public StampBase`
`42`	`49`	`virtualintmaxSize()override {return max_size;}`
`43`	`50`	`};`
`44`	`51`
`45`		`-classStampUnbounded :publicStampBase`
	`52`	`+classStampUnbounded :publicvirtualStampBase`
`46`	`53`	`{`
`47`	`54`	`protected:`
`48`	`55`	`int min_size;`

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,14 @@`
`3`	`3`
`4`	`4`	`#include<string>`
`5`	`5`	`#include"helpers.h"`
	`6`	`+#include"stamp.h"`
`6`	`7`
`7`		`-template<classT>classStampArithm:publicStampFixed`
	`8`	`+template<classT>classStampArithm:publicStampFixed,publicStampBaseT<T>`
`8`	`9`	`{`
`9`	`10`	`public:`
`10`	`11`	`StampArithm() { size =sizeof(T);};`
`11`		`- std::stringExtractStr(Blob &blob)override;`
`12`		`- TExtractValue(Blob &blob);`
	`12`	`+virtualstd::stringExtractStr(Blob &blob)override;`
	`13`	`+virtualTExtractValue(Blob &blob)override;`
`13`	`14`	`};`
`14`	`15`
`15`	`16`	`template<classT> std::string`
`@@ -30,10 +31,6 @@ template<class T> T`
`30`	`31`	`StampArithm<T>::ExtractValue(Blob &blob)`
`31`	`32`	`{`
`32`	`33`	`std::vector<char> v =ExtractBin(blob);`
`33`		`-if (v.size() ==0)`
`34`		`- {`
`35`		`-/* FIXME exeption should be here*/`
`36`		`- }`
`37`	`34`	`T pT = (T ) &v[0];`
`38`	`35`	`return *pT;`
`39`	`36`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ main()`
`93`	`93`
`94`	`94`	`signedint sample[] = {1, -2, -30,40, -55,6};`
`95`	`95`	`StampArithm<signedint> stamp;`
`96`		`- GalleyVectorV<signedint, StampArithm<signedint>>galley(stamp);`
	`96`	`+ GalleyVectorV<signedint>galley(stamp);`
`97`	`97`	`Blobblob((char*)sample,sizeof(sample));`
`98`	`98`	`std::vector<signedint> res = galley.ExtractValues(blob);`
`99`	`99`	`ok(!memcmp((void) &sample, (void ) &res[0],sizeof(sample)),"GalleyVectorV returns ok");`

Comments

(0)