attrib_container.cpp 22.5 KB
Newer Older
Pierre Kraemer's avatar
Pierre Kraemer committed
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
/*
 * attrib_container.cpp
 *
 *  Created on: Jun 10, 2010
 *      Author: thery
 */

#include <typeinfo>
#include <stdio.h>
#include <string.h>
#include <libxml/encoding.h>
#include <libxml/xmlwriter.h>
#include <iostream>

#include "Container/attrib_container.h"

namespace CGoGN
{

AttribContainer::AttribContainer():
m_nbunknown(0),
m_nbAttributes(0),
m_size(0),
m_maxSize(0),
m_lineCost(0),
m_attributes_registry_map(NULL)
{
	m_holesBlocks.reserve(512);
}

AttribContainer::~AttribContainer()
{
}

void AttribContainer::swap(AttribContainer& cont)
{
	m_holesBlocks.swap(cont.m_holesBlocks);
	m_tableBlocksWithFree.swap(cont.m_tableBlocksWithFree);
	m_tableAttribs.swap(cont.m_tableAttribs);
	m_attribNameMap.swap(cont.m_attribNameMap);

	unsigned int temp = m_nbAttributes;
	m_nbAttributes = cont.m_nbAttributes;
	cont.m_nbAttributes = temp;

	temp = m_size;
	m_size = cont.m_size;
	cont.m_size = temp;

	temp = m_maxSize;
	m_maxSize = cont.m_maxSize;
	cont.m_maxSize = temp;

	temp = m_lineCost;
	m_lineCost = cont.m_lineCost;
	cont.m_lineCost = temp;
}

bool AttribContainer::removeAttribute(const std::string& attribName)
{
	MapNameId::iterator it = m_attribNameMap.find(attribName);
	if (it == m_attribNameMap.end())
	{
		std::cerr << "removeAttribute by name: attribut inconnu" << std::endl;
		return false;
	}

	// delete the attribute
	delete (m_tableAttribs[it->second]);
	m_tableAttribs[it->second] = NULL;

	// remove the attribute from the name map
	m_attribNameMap.erase(it);

	m_nbAttributes--;

	return true;
}

bool AttribContainer::removeAttribute(unsigned int index)
{
	MapNameId::iterator it = m_attribNameMap.begin();
	while ((it != m_attribNameMap.end()) && (it->second != index))
		++it;
	if (it != m_attribNameMap.end())
	{
		// remove the attribute from the name map
		m_attribNameMap.erase(it);
	}
	// else it was an attribute without name

	// delete the attribute
	delete (m_tableAttribs[index]);
	m_tableAttribs[index] = NULL;

	m_nbAttributes--;

	return true;
}

void AttribContainer::merge(AttribContainer& cont)
{
	/*
	// tableau de correspondance pour reperer les tables de cont et les mettre ou il faut dans this
	std::vector<unsigned int> newId;
	newId.resize(m_tableAttribs.size() + cont.m_tableAttribs.size());


109
	unsigned int nbb = m_holesBlocks.size();
Pierre Kraemer's avatar
Pierre Kraemer committed
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399

	// parcours des attributs de cont pour les ajouter dans this et stocker la correspondance
	for (MapNameId::iterator it = cont.m_attribNameMap.begin(); it != cont.m_attribNameMap.end(); ++it)
	{
		MapNameId::iterator jt = m_attribNameMap.find(it->first);
		if ( jt == m_attribNameMap.end() )
		{
			unsigned int idxAttrib = m_tableAttribs.size();
			m_attribNameMap.insert(std::pair<std::string, unsigned int>(it->first,idxAttrib));
			m_nbAttributes++;

			newId[idxAttrib] = it->second;
			AttribMultiVectGen* ptr = cont.m_tableAttribs[it->second];
			ptr->addBlocksBefore(nbb);
			m_tableAttribs.push_back( ptr );
		}
		else
		{
			newId[jt->second] = it->second;
		}
	}

	// ajoute les donnees de cont à la fin des tables de this si necessaire
	for (MapNameId::iterator it = m_attribNameMap.begin(); it != m_attribNameMap.end(); ++it)
	{
		if (m_tableAttribs.size() == nbb)
		{
			unsigned int id = it->second;
			m_tableAttribs[id]->merge(cont.m_tableAttribs[ newId[id] ]);
		}
	}

	// merge des trous !!
	for(std::vector<  HoleBlockRef* >::iterator it = cont.m_holesBlocks.begin(); it != cont.m_holesBlocks.end(); ++it)
	{
		m_holesBlocks.push_back(*it);
	}

	// decalage entre le
	unsigned int shift_index = nbb*_BLOCKSIZE_;

	//et des block avec des trous !
	for (std::vector<unsigned int>::iterator it = cont.m_tableBlocksWithFree.begin(); it != cont.m_tableBlocksWithFree.end(); ++it)
	{
		m_tableBlocksWithFree.push_back(shift_index + (*it));
	}

	// MAJ du nbre d'elts
	m_size += cont.m_size;

	// MAJ de la taille max (id dernier elt +1)
	m_maxSize = m_size + cont.m_maxSize;

	return shift_index;
	*/
}

void AttribContainer::saveXml(xmlTextWriterPtr writer, unsigned int id)
{
	if (m_nbAttributes == 0)
		return;

	// noeud du container
	int rc = xmlTextWriterStartElement(writer, BAD_CAST "Attributes_Container");
	rc = xmlTextWriterWriteFormatAttribute(writer,  BAD_CAST "id","%u",id);
	rc = xmlTextWriterWriteFormatAttribute(writer,  BAD_CAST "BlockSize","%u",_BLOCKSIZE_);
	rc = xmlTextWriterWriteFormatAttribute(writer,  BAD_CAST "size","%u",m_maxSize);


	// recuperer le nombre d'attributs
	unsigned int nbAtt = m_attribNameMap.size();
	unsigned int sizeVectAtt = m_tableAttribs.size();

	// noeud avec la liste de attributs
	rc = xmlTextWriterStartElement(writer, BAD_CAST "Attributes_Names");
	rc = xmlTextWriterWriteFormatAttribute(writer,  BAD_CAST "nb","%u",nbAtt);
	rc = xmlTextWriterWriteFormatAttribute(writer,  BAD_CAST "sv","%u",sizeVectAtt);

	// recuperer les attributs dans la map et les sauver
	for (std::map<std::string, unsigned int>::iterator it = m_attribNameMap.begin(); it!= m_attribNameMap.end(); ++it)
	{
		int rc = xmlTextWriterStartElement(writer, BAD_CAST "Attribute");
		rc = xmlTextWriterWriteAttribute(writer,  BAD_CAST "name",BAD_CAST (it->first).c_str());
		const std::string& str_type = m_tableAttribs[it->second]->getTypeName();
		rc = xmlTextWriterWriteAttribute(writer,  BAD_CAST "type",BAD_CAST str_type.c_str());
		rc = xmlTextWriterWriteFormatAttribute(writer,  BAD_CAST "id","%u",it->second);
		rc = xmlTextWriterEndElement(writer);
	}
	// fin du noeud
	rc = xmlTextWriterEndElement(writer);


	// parcourir le container et sauver les lignes
	rc = xmlTextWriterStartElement(writer, BAD_CAST "Data_Lines");
//	rc = xmlTextWriterWriteFormatAttribute(writer,  BAD_CAST "size","%u",m_maxSize);
	for (unsigned int i = 0; i != m_maxSize; ++i)
	{
		unsigned int nbr = nbRefs(i);
		rc = xmlTextWriterStartElement(writer, BAD_CAST "Line");
		rc = xmlTextWriterWriteFormatAttribute(writer,  BAD_CAST "id","%u",i);
		rc = xmlTextWriterWriteFormatAttribute(writer,  BAD_CAST "refs","%u",nbr);
		if (nbr>0)
		{
			// tous les attributs de la ligne
			for (MapNameId::iterator it = m_attribNameMap.begin(); it!= m_attribNameMap.end(); ++it)
			{
				std::string st_att = m_tableAttribs[it->second]->output(i);
				rc = xmlTextWriterWriteAttribute(writer,(xmlChar*)( (it->first).c_str()), (xmlChar*)( st_att.c_str()));
			}
		}
		// fin du noeud Line
		rc = xmlTextWriterEndElement(writer);
	}
	// fin du noeud Data Lines
	rc = xmlTextWriterEndElement(writer);

	// fin du noeud Container
	rc = xmlTextWriterEndElement(writer);

}

bool AttribContainer::loadXmlBWF(xmlNodePtr node)
{
	xmlChar* prop = xmlGetProp(node, BAD_CAST "nb");
	unsigned int nb = atoi((char*)prop);
	m_tableBlocksWithFree.clear();

	// charge et cree les  attributs
	for (xmlNode* x_node = node->children; x_node!=NULL; x_node = x_node->next)
	{
		unsigned int ind = atoi((char*)(xmlNodeGetContent(x_node)));
		m_tableBlocksWithFree.push_back(ind);
	}
	if (m_tableBlocksWithFree.size() != nb)
	{
		std::cerr <<"Erreur lecture fichier XML incoherent"<< std::endl;
		return false;
	}
	return true;
}

bool AttribContainer::loadXmlAN(xmlNodePtr node, unsigned int nbb)
{
	xmlChar* prop = xmlGetProp(node, BAD_CAST "nb");
//	unsigned int nb = atoi((char*)prop);
	prop = xmlGetProp(node, BAD_CAST "sv");
//	unsigned int sv = atoi((char*)prop);


	// Noooooooo!!!!
//	m_tableAttribs.resize(sv);
//	for (unsigned int i=0; i< sv; ++i)
//			m_tableAttribs[i]=NULL;

	// charge et cree les  attributs
	for (xmlNode* x_node = node->children; x_node!=NULL; x_node = x_node->next)
	{
		prop = xmlGetProp(x_node, BAD_CAST "id");
//		unsigned int id = unsigned int(atoi((char*)prop);

		prop = xmlGetProp(x_node, BAD_CAST "type");
		// recupere l'attribut enregistrer par son type
		if (m_attributes_registry_map !=NULL)
		{
			std::map<std::string, RegisteredBaseAttribute*>::iterator itAtt = m_attributes_registry_map->find(std::string((char*)prop));
			if (itAtt == m_attributes_registry_map->end())
			{
				std::cout << "Skipping non registred attribute "<< std::string((char*)prop)<<std::endl;
			}
			else
			{
				RegisteredBaseAttribute* ra = itAtt->second;
				prop = xmlGetProp(x_node, BAD_CAST "name");
//				ra->addAttribute(*this, std::string((char*)prop), id);
				unsigned int idAtt = ra->addAttribute(*this, std::string((char*)prop));
				m_tableAttribs[idAtt]->setNbBlocks(nbb);
			}
		}
		else
		{
			std::cerr << "Attribute Registry non initialized"<< std::endl;
			return false;
		}
	}
//	if (m_attribNameMap.size() != nb)
//	{
//		std::cerr << "Pb lecture attributs"<< std::endl;
//		return false;
//	}
	return true;
}

bool AttribContainer::loadXmlDL(xmlNodePtr node)
{
	// charge et cree les  attributs
	for (xmlNode* x_node = node->children; x_node!=NULL; x_node = x_node->next)
	{
		// get index
		xmlChar* prop = xmlGetProp(x_node, BAD_CAST "id");
		unsigned int id = atoi((char*)prop);
		// get & set nbref
		prop = xmlGetProp(x_node, BAD_CAST "refs");
		unsigned int nbr = atoi((char*)prop);
		setRefLine(id,nbr);

		if (nbr>0)
		{
			for (MapNameId::iterator it=m_attribNameMap.begin(); it!=m_attribNameMap.end(); ++it)
			{
				prop = xmlGetProp(x_node, BAD_CAST (it->first).c_str());
				// if name of data unkwown then error
				if (prop == NULL)
				{
					std::cerr << "inconsistent xml file"<<std::endl;
					return false;
				}
				m_tableAttribs[it->second]->input(id,std::string((char*)prop));
			}
		}

	}

	return true;
}


unsigned int AttribContainer::getIdXmlNode(xmlNodePtr node)
{
	xmlChar *prop = xmlGetProp(node, BAD_CAST "id");
	unsigned int id = atoi((char*)prop);
	return id;
}

bool AttribContainer::loadXml(xmlNodePtr node)
{
	xmlChar *prop = xmlGetProp(node, BAD_CAST "BlockSize");
	unsigned int bs = atoi((char*)prop);

	if (bs != _BLOCKSIZE_)
	{
		std::cerr << "Chargement impossible, tailles de block differentes: "<<_BLOCKSIZE_<<" / " << bs << std::endl;
		return false;
	}

//	prop = xmlGetProp(node, BAD_CAST "id");
//	unsigned int id = atoi((char*)prop);

	prop = xmlGetProp(node, BAD_CAST "size");
	m_maxSize = atoi((char*)prop);


	char* ANnode = (char*)"Attributes_Names";
	char* DLnode= (char*)"Data_Lines";

	// calcul le nombre de block et les alloue
	unsigned int nbb = m_maxSize/_BLOCKSIZE_;
	if (m_maxSize%_BLOCKSIZE_)
			nbb++;

	m_holesBlocks.resize(nbb);
	for (unsigned int i=0; i<nbb; ++i)
		m_holesBlocks[i] = new HoleBlockRef;

	//load Attributes
	xmlNode* cur = node->children;
	while ( strcmp((char*)(cur->name),ANnode))
		cur = cur->next;
	loadXmlAN(cur,nbb);

	cur = node->children;
	while ( strcmp((char*)(cur->name),DLnode))
		cur = cur->next;
	loadXmlDL(cur);

	// recreate free holes in blocks
	nbb--;
	for (unsigned int i=0; i< nbb; ++i)
	{
		if ( m_holesBlocks[i]->updateHoles(_BLOCKSIZE_) )
		{
			m_tableBlocksWithFree.push_back(i);
		}
	}
	m_holesBlocks[nbb]->updateHoles(m_maxSize - nbb*_BLOCKSIZE_);

	return true;
}

void AttribContainer::saveBin(CGoGNostream& fs, unsigned int id)
{
Pierre Kraemer's avatar
Pierre Kraemer committed
400
	// en ascii id et taille les tailles
Pierre Kraemer's avatar
Pierre Kraemer committed
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416

	std::vector<unsigned int> bufferui;
	bufferui.reserve(6);

	bufferui.push_back(id);
	bufferui.push_back(_BLOCKSIZE_);
	bufferui.push_back(m_holesBlocks.size());
	bufferui.push_back(m_tableBlocksWithFree.size());
	bufferui.push_back(m_nbAttributes);
	bufferui.push_back(m_size);
	bufferui.push_back(m_maxSize);

	std::cout << "Save Container: id:" <<id <<"  nbAtt:"<<m_nbAttributes << "  size:"<<m_size<<std::endl;

	fs.write(reinterpret_cast<const char*>(&bufferui[0]) ,bufferui.size()*sizeof(unsigned int));

Pierre Kraemer's avatar
Pierre Kraemer committed
417
	unsigned int i = 0;
Pierre Kraemer's avatar
Pierre Kraemer committed
418
419
420
	for(std::vector<AttribMultiVectGen*>::iterator it=m_tableAttribs.begin(); it!=m_tableAttribs.end(); ++it)
	{
		if (*it !=NULL)
Pierre Kraemer's avatar
Pierre Kraemer committed
421
			(*it)->saveBin(fs, i++);
Pierre Kraemer's avatar
Pierre Kraemer committed
422
423
424
	}

	//en binaire les blocks de ref
Pierre Kraemer's avatar
Pierre Kraemer committed
425
426
	for (std::vector<HoleBlockRef*>::iterator it = m_holesBlocks.begin(); it != m_holesBlocks.end(); ++it)
		(*it)->saveBin(fs);
Pierre Kraemer's avatar
Pierre Kraemer committed
427
428

	// les indices des blocks libres
429
	fs.write(reinterpret_cast<const char*>(&m_tableBlocksWithFree[0]), m_tableBlocksWithFree.size() * sizeof(unsigned int));
Pierre Kraemer's avatar
Pierre Kraemer committed
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
}

unsigned int AttribContainer::loadBinId(CGoGNistream& fs)
{
	unsigned int id;
	fs.read(reinterpret_cast<char*>(&id), sizeof(unsigned int));
	return id;
}

bool AttribContainer::loadBin(CGoGNistream& fs)
{
	if (m_attributes_registry_map ==NULL)
	{
		std::cerr << "Attribute Registry non initialized"<< std::endl;
		return false;
	}

	std::vector<unsigned int> bufferui;
	bufferui.resize(256);

	fs.read(reinterpret_cast<char*>(&(bufferui[0])), 6*sizeof(unsigned int));

Pierre Kraemer's avatar
Pierre Kraemer committed
452
	unsigned int bs, szHB, szBWF, nbAtt;
Pierre Kraemer's avatar
Pierre Kraemer committed
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
	bs = bufferui[0];
	szHB = bufferui[1];
	szBWF = bufferui[2];
	nbAtt = bufferui[3];
	m_size = bufferui[4];
	m_maxSize = bufferui[5];

	if (bs != _BLOCKSIZE_)
	{
		std::cerr << "Chargement impossible, tailles de block differentes: "<<_BLOCKSIZE_<<" / " << bs << std::endl;
		return false;
	}

	for (unsigned int j=0; j < nbAtt; ++j)
	{
		std::string nameAtt;
		std::string typeAtt;
		/*unsigned int id = */AttribMultiVectGen::loadBinInfos(fs,nameAtt, typeAtt);

		std::map<std::string, RegisteredBaseAttribute*>::iterator itAtt = m_attributes_registry_map->find(typeAtt);
		if (itAtt == m_attributes_registry_map->end())
		{
			std::cout << "Skipping non registred attribute of type name"<< typeAtt <<std::endl;
			AttribMultiVectGen::skipLoadBin(fs);
		}
		else
		{
			RegisteredBaseAttribute* ra = itAtt->second;
			unsigned int idAtt = ra->addAttribute(*this, nameAtt);
Pierre Kraemer's avatar
Pierre Kraemer committed
482
			std::cout << "loading attribute " << nameAtt << " : " << typeAtt << std::endl;
Pierre Kraemer's avatar
Pierre Kraemer committed
483
484
485
486
487
488
489
490
491
			m_tableAttribs[idAtt]->loadBin(fs);
			// no need the set the nb of block (done by binary read of attribmv)
			m_nbAttributes++;
		}
	}

	m_holesBlocks.resize(szHB);

	// blocks
Pierre Kraemer's avatar
Pierre Kraemer committed
492
	for (unsigned int i = 0; i < szHB; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
493
494
495
496
497
498
499
	{
		m_holesBlocks[i] = new HoleBlockRef;
		m_holesBlocks[i]->loadBin(fs);
	}

	// les indices des blocks libres
	m_tableBlocksWithFree.resize(szBWF);
500
	fs.read(reinterpret_cast<char*>(&(m_tableBlocksWithFree[0])), szBWF*sizeof(unsigned int));
Pierre Kraemer's avatar
Pierre Kraemer committed
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915

	return true;
}

///////////////////////////
// GESTION DES ATTRIBUTS
///////////////////////////

unsigned int AttribContainer::getAttribute(const std::string& attribName)
{
	MapNameId::iterator it = m_attribNameMap.find(attribName);
	if (it == m_attribNameMap.end())
	{
		return UNKNOWN;
	}
	return it->second;
}

bool AttribContainer::isValidAttribute(unsigned int attr)
{
	if (attr == UNKNOWN)
		return false;

	for (MapNameId::iterator it = m_attribNameMap.begin(); it!= m_attribNameMap.end(); ++it)
	{
		if (it->second == attr)
			return true;
	}

	return false;
}

unsigned int AttribContainer::getAttributesStrings(std::vector<std::string>& strings)
{
	strings.clear();

	strings.resize(m_tableAttribs.size());

	for (MapNameId::iterator it = m_attribNameMap.begin(); it!= m_attribNameMap.end(); ++it)
	{
		strings[it->second] = it->first;
	}

	return m_attribNameMap.size();
}

const std::string& AttribContainer::getAttributeName(unsigned int attrIndex)
{
	for (MapNameId::iterator it = m_attribNameMap.begin(); it!= m_attribNameMap.end(); ++it)
	{
		if(it->second == attrIndex)
			return it->first;
	}

	std::cerr << "Fail finding attribute name" << std::endl;
	return  m_attribNameMap.begin()->first;		// just for compiling
}

unsigned int AttribContainer::nbAttributes()
{
	return m_attribNameMap.size();
}

///////////////////////////
//   GESTION DES LIGNES
///////////////////////////

unsigned int AttribContainer::insertLine()
{
	// if no more rooms
	if (m_tableBlocksWithFree.empty())
	{
		HoleBlockRef* ptr = new HoleBlockRef();					// new block
		m_tableBlocksWithFree.push_back(m_holesBlocks.size());	// add its future position to block_free
		m_holesBlocks.push_back(ptr);							// and add it to block table

		for(unsigned int i = 0; i < m_tableAttribs.size(); ++i)
		{
			if (m_tableAttribs[i] != NULL)
				m_tableAttribs[i]->addBlock();						//ajoute un bloc a chaque attribut
		}
	}

	// get the first free block index (last in vector)
	unsigned int bf = m_tableBlocksWithFree.back();
	// get the block
	HoleBlockRef* block = m_holesBlocks[bf];

	// add new elt in block and compute index
	unsigned int ne = block->newRefElt(m_maxSize);
	unsigned int idx = _BLOCKSIZE_*bf + ne;

	// if no more room in block remove it from free_blocks
	if (block->full())
		m_tableBlocksWithFree.pop_back();

	m_size++;

//	// init the line (all attributes)
//	for(unsigned int i = 0; i < m_tableAttribs.size(); ++i)
//	{
//		if (m_tableAttribs[i] != NULL)
//			m_tableAttribs[i]->initElt(idx);
//	}

	return idx;
}

void AttribContainer::initLine(unsigned int idx)
{
	for(unsigned int i = 0; i < m_tableAttribs.size(); ++i)
	{
		if (m_tableAttribs[i] != NULL)
			m_tableAttribs[i]->initElt(idx);
	}
}

void AttribContainer::removeLine(unsigned int eltIdx)
{
	unsigned int bi = eltIdx / _BLOCKSIZE_;
	unsigned int j = eltIdx % _BLOCKSIZE_;

	HoleBlockRef* block = m_holesBlocks[bi];

	if (block->used(j))
	{
		if (block->full())		// block has no free elts before removing
			m_tableBlocksWithFree.push_back(bi);

		block->removeElt(j);

		m_size--;

		if (block->empty())		// block is empty after removing
			m_tableBlocksEmpty.push_back(bi);
	}
	else
	{
		std::cout << "Error removing non existing index " << eltIdx << std::endl;
	}
}

void AttribContainer::copyLine(unsigned int dstIdx, unsigned int srcIdx)
{
	for(unsigned int i = 0; i < m_tableAttribs.size(); ++i)
	{
		if (m_tableAttribs[i] != NULL)
			m_tableAttribs[i]->copyElt(dstIdx, srcIdx);
	}
}

///////////////////////////
// GESTION DES ITERATEURS
///////////////////////////

//void AttribContainer::next(iterator& it)
//{
//	do
//	{
//		++it;
//	} while ((it<m_maxSize) && (!used(it)));
//}

//AttribContainer::iterator AttribContainer::AttribContainer::end()
//{
//	return m_maxSize;
//
////	if (m_holesBlocks.empty())
////		return 0;
////	return (m_holesBlocks.back())->sizeTable() + (m_holesBlocks.size()-1)*_BLOCKSIZE_;
//}


///////////////////////////
// GESTION DES TAILLES
///////////////////////////

unsigned int AttribContainer::size()
{
	return m_size;
}

unsigned int AttribContainer::capacity()
{
	return m_holesBlocks.size()*_BLOCKSIZE_;
}

unsigned int AttribContainer::memoryTotalSize()
{
	return _BLOCKSIZE_*(m_holesBlocks.size()*m_lineCost + 8);
}

unsigned int AttribContainer::nbRefs(unsigned int it)
{
	unsigned int bi = it / _BLOCKSIZE_;
	unsigned int j = it % _BLOCKSIZE_;

	return m_holesBlocks[bi]->nbRefs(j);
}


///////////////////////////
//   COMPACTAGE
///////////////////////////

void AttribContainer::compact(std::vector<unsigned int>& mapOldNew)
{
	unsigned int nbe = _BLOCKSIZE_*m_holesBlocks.size();

	unsigned int nbb = m_holesBlocks.size()-1;
	while ((m_holesBlocks[nbb])->empty())
	{
		nbb--;
		nbe -= _BLOCKSIZE_;
	}
	nbb++;

	mapOldNew.reserve(nbe);

	// now get the holes
	unsigned int baseAdr=0;
	for (unsigned int i=0; i< nbb; ++i)
	{
		HoleBlockRef* block = m_holesBlocks[i];

		for (unsigned int j=0; j<_BLOCKSIZE_; ++j)
		{
			if ( j < block->sizeTable())
			{
				if (block->used(j))
				{
					mapOldNew.push_back(baseAdr);
				}
				else
				{
					mapOldNew.push_back(0xffffffff);
				}
			}
			else
			{
				mapOldNew.push_back(0xffffffff);
			}
			baseAdr++;
		}
	}

	unsigned int last = mapOldNew.size() - 1;

 	for (unsigned int i=0 ; i <last; ++i)
	{
		unsigned int val = mapOldNew[i];
		if (val == 0xffffffff)
		{
			// first find last element
			while (mapOldNew[last] ==  0xffffffff)
				--last;

			// store it in the hole
			// find the blocks and indices
			unsigned int bi = i / _BLOCKSIZE_;
			unsigned int ib = i % _BLOCKSIZE_;
			unsigned int bj = last / _BLOCKSIZE_;
			unsigned int jb = last % _BLOCKSIZE_;

			//overwrite attributes
			for(unsigned int j=0; j< m_tableAttribs.size(); ++j)
			{
				if (m_tableAttribs[j]!=NULL)
					m_tableAttribs[j]->overwrite(bj,jb,bi,ib);
			}

			// overwrite emptyLine with last line in free blocks
			m_holesBlocks[bi]->overwrite(ib, m_holesBlocks[bj], jb);

			// set the map value
			mapOldNew[last] = i;
			last--;
		}
	}

	for (int i=m_holesBlocks.size()-1; i>=0; --i)
	{
		HoleBlockRef* ptr = m_holesBlocks[i];
		if ( ptr->compressFree())
		{
			delete ptr;
			m_holesBlocks.pop_back();
		}
	}

	// maj de la table de block libre
	m_tableBlocksWithFree.clear();
	HoleBlockRef* block = m_holesBlocks.back();
	if (! block->full())
	{
		m_tableBlocksWithFree.push_back(m_holesBlocks.size()-1);
	}

	// detruit les blocks de donnees inutiles
	for(unsigned int j=0; j< m_tableAttribs.size(); ++j)
	{
		if (m_tableAttribs[j]!=NULL)
			m_tableAttribs[j]->setNbBlocks(m_holesBlocks.size());
	}

	m_maxSize = (m_holesBlocks.back())->sizeTable() + (m_holesBlocks.size()-1)*_BLOCKSIZE_;
}


///////////////////////////
//   NETTOYAGE
///////////////////////////

void AttribContainer::clear(bool clearAttrib)
{
	m_size = 0;
 	m_maxSize = 0;

	std::vector< HoleBlockRef* > bf;
	std::vector< unsigned int > bwf;

	// raz des cases libres
	for (std::vector< HoleBlockRef* >::iterator it = m_holesBlocks.begin(); it!= m_holesBlocks.end(); ++it)
	{
		delete (*it);
	}
	m_holesBlocks.swap(bf);
	m_tableBlocksWithFree.swap(bwf);

	// detruit les données
	for (std::vector< AttribMultiVectGen* >::iterator it = m_tableAttribs.begin(); it!=  m_tableAttribs.end(); ++it)
	{
		if ((*it) != NULL)
			(*it)->free();
	}

	// on enleve les attributs ?
	if (clearAttrib)
	{
		// nb a zero
		m_nbAttributes = 0;
		// detruit la map nom-attribut
		m_attribNameMap.clear();

		// detruit tous les attributs
		std::vector< AttribMultiVectGen* > amg;
		for (std::vector< AttribMultiVectGen* >::iterator it = m_tableAttribs.begin(); it != m_tableAttribs.end(); ++it)
		{
			if ((*it) != NULL)
				delete (*it);
		}
		m_tableAttribs.swap(amg);
	}
}

///////////////////////////
// OLD INLINE FUNCTIONS
///////////////////////////

void AttribContainer::affect(unsigned int i, unsigned int j)
{
	for (std::vector< AttribMultiVectGen* >::iterator it = m_tableAttribs.begin(); it!=  m_tableAttribs.end(); ++it)
	{
		if (*it != NULL)
			(*it)->affect(i, j);
	}
}

void AttribContainer::add(unsigned int i, unsigned int j)
{
	for (std::vector< AttribMultiVectGen* >::iterator it = m_tableAttribs.begin(); it!=  m_tableAttribs.end(); ++it)
	{
		if ((*it) != NULL)
			(*it)->add(i, j);
	}
}

void AttribContainer::sub(unsigned int i, unsigned int j)
{
	for (std::vector< AttribMultiVectGen* >::iterator it = m_tableAttribs.begin(); it!=  m_tableAttribs.end(); ++it)
	{
		if ((*it) != NULL)
			(*it)->sub(i, j);
	}
}

void AttribContainer::mult(unsigned int i, double alpha)
{
	for (std::vector< AttribMultiVectGen* >::iterator it = m_tableAttribs.begin(); it!=  m_tableAttribs.end(); ++it)
	{
		if ((*it) != NULL)
			(*it)->mult(i, alpha);
	}
}

void AttribContainer::div(unsigned int i, double alpha)
{
	for (std::vector< AttribMultiVectGen* >::iterator it = m_tableAttribs.begin(); it!=  m_tableAttribs.end(); ++it)
	{
		if ((*it) != NULL)
			(*it)->div(i, alpha);
	}
}

void AttribContainer::lerp(unsigned res, unsigned int i, unsigned int j, double alpha)
{
	for (std::vector< AttribMultiVectGen* >::iterator it = m_tableAttribs.begin(); it!=  m_tableAttribs.end(); ++it)
	{
		if ((*it) != NULL)
			(*it)->lerp(res, i, j, alpha);
	}
}

}