week 1 deel 2

8 files changed, 407 insertions, 223 deletions

diff --git a/algo1w1/IntOrderedArray.cpp b/algo1w1/IntOrderedArray.cpp
new file mode 100644
index 0000000..d84401f
--- /dev/null
+++ b/algo1w1/IntOrderedArray.cpp
@@ -0,0 +1,83 @@
+#include "IntOrderedArray.h"
+#include <iostream>
+
+IntOrderedArray::IntOrderedArray() {
+}
+
+
+IntOrderedArray::~IntOrderedArray() {
+}
+
+void IntOrderedArray::exploreBinarySearch(int searchKey) const {
+	int lowerBound = 0;
+	int upperBound = _collectionSize - 1;
+	int curIn;
+	while(1) {
+		curIn = (lowerBound + upperBound ) / 2;
+		if(_collection[curIn] == searchKey)
+			return (void) curIn; // found it
+		else if(lowerBound > upperBound) {
+			std::cout << "[" << lowerBound << ", " << upperBound << "]" << std::endl;
+			return (void) _collectionSize; // can’t find it
+		}
+		else // divide range
+		{
+			if(_collection[curIn] < searchKey)
+				lowerBound = curIn + 1; // it’s in upper half
+			else
+				upperBound = curIn - 1; // it’s in lower half
+		} // end find()
+	}
+}
+
+/*
+ * vul hieronder de tabel in voor vraag 3.b
+ *
+ * waarde lowerbound upprbound
+ *                   ~~~~~~~~~
+ * 0  [0, -1]
+ * 2  [1, 0]
+ * 4  [2, 1]
+ * 5  [2, 1]
+ * 23 [6, 5]
+ * 26 [6, 5]
+ * 30 [7, 6]
+ */
+
+/*
+ * formuleer hieronder het antwoord op vraag 3.c
+ *
+ * in een ideale wereld waar alle array's alle elementen bevatten die je maar
+ * zou willen zoeken zou de index van het nummer dat je zoekt tussen upperBound
+ * en lowerBound liggen, e.g. "4" zou tussen 3 en 6 liggen met index 1 en 2.
+ */
+
+int IntOrderedArray::getLastElementSmallerOrEqualTo(int) const {
+	return -1;
+}
+
+void IntOrderedArray::moveElementsOnePositionToRight(int) {
+	// deze code wordt nergens gebruikt(?)
+}
+
+int IntOrderedArray::quickInsert(int value) {
+	int i;
+	// find insert index
+	for (i = 0; i < _collectionSize; i++) {
+		if (_collection[i] > value) break;
+	}
+	// shift elements
+	for (int k = _collectionSize; k >= i; k--) {
+		if (k == 0) continue;
+		_collection[k] = _collection[k-1];
+	}
+	_collectionSize++;
+	_collection[i] = value;
+	return i;
+}
+
+void IntOrderedArray::showAll() const {
+	for (unsigned i = 0; i < _collectionSize; i++) {
+		printf("%02d: %d\n", i, _collection[i]);
+	}
+}
diff --git a/algo1w1/IntOrderedArray.h b/algo1w1/IntOrderedArray.h
new file mode 100644
index 0000000..914e59f
--- /dev/null
+++ b/algo1w1/IntOrderedArray.h
@@ -0,0 +1,24 @@
+#pragma once
+
+class IntOrderedArray {
+public:
+	IntOrderedArray();
+	virtual ~IntOrderedArray();
+
+public:
+	virtual void exploreBinarySearch(int) const;
+
+public:
+	virtual int getLastElementSmallerOrEqualTo(int) const;
+	virtual void moveElementsOnePositionToRight(int);
+
+	virtual int quickInsert(int);
+
+public:
+	virtual void showAll() const;
+
+private:
+	int _collection[20] = { 0 };
+	unsigned _collectionSize = 0;
+};
+
diff --git a/algo1w1/NAW.cpp b/algo1w1/NAW.cpp
index 72b1b29..907ad21 100644
--- a/algo1w1/NAW.cpp
+++ b/algo1w1/NAW.cpp
@@ -11,6 +11,16 @@ NAW::NAW(const std::string& naam, const std::string& adres, const std::string& w
 
 NAW::~NAW() { }
 
+int NAW::compareTo(const NAW& other) const {
+	int c;
+	c = getPlaats().compare(other.getPlaats());
+	if (c != 0) return c;
+	c = getNaam().compare(other.getNaam());
+	if (c != 0) return c;
+	c = getAdres().compare(other.getAdres());
+	return c;
+}
+
 const std::string& NAW::getNaam() const { return _naam; }
 const std::string& NAW::getAdres() const { return _adres; }
 const std::string& NAW::getPlaats() const { return _woonplaats; }
@@ -22,3 +32,11 @@ void NAW::setPlaats(const std::string& woonplaats) { _woonplaats = woonplaats; }
 bool NAW::heeftNaam(const std::string& naam) const { return getNaam().compare(naam) == 0; }
 bool NAW::heeftAdres(const std::string& adres) const { return getAdres().compare(adres) == 0; }
 bool NAW::heeftPlaats(const std::string& woonplaats) const { return getPlaats().compare(woonplaats) == 0; }
+
+std::ostream& operator << (std::ostream& output, const NAW& naw) {
+	output <<
+		"naam: " << naw.getNaam() << std::endl <<
+		"adres: " << naw.getAdres() << std::endl <<
+		"plaats: " << naw.getPlaats() << std::endl;
+	return output;
+}
diff --git a/algo1w1/NAW.h b/algo1w1/NAW.h
index ad38133..75fd2c6 100644
--- a/algo1w1/NAW.h
+++ b/algo1w1/NAW.h
@@ -10,6 +10,9 @@ public:
 	virtual ~NAW();
 
 public:
+	int compareTo(const NAW&) const;
+
+public:
 	virtual const std::string& getNaam() const;
 	virtual const std::string& getAdres() const;
 	virtual const std::string& getPlaats() const;
@@ -24,6 +27,9 @@ public:
 	virtual bool heeftAdres(const std::string&) const;
 	virtual bool heeftPlaats(const std::string&) const;
 
+public:
+	friend std::ostream& operator << (std::ostream& output, const NAW& naw);
+
 private:
 	std::string _naam, _adres, _woonplaats;
 };
diff --git a/algo1w1/NAWOrderedArray.cpp b/algo1w1/NAWOrderedArray.cpp
new file mode 100644
index 0000000..6bce0cc
--- /dev/null
+++ b/algo1w1/NAWOrderedArray.cpp
@@ -0,0 +1,67 @@
+#include "NAWOrderedArray.h"
+#include "NAW.h"
+#include <iostream>
+#include <math.h>
+
+NAWOrderedArray::NAWOrderedArray() { }
+
+NAWOrderedArray::~NAWOrderedArray() { }
+
+int NAWOrderedArray::find(const NAW& naw) const {
+	unsigned tail = 0, head = _nawCollectionSize; // range is tail to head non-inclusive
+	unsigned max_attempts = log2(_nawCollectionSize) + 1; // return -1 infinite loop failsafe
+	for (unsigned x = 0; x < max_attempts; x++) {
+		unsigned guess = (head + tail) / 2; // take middle index
+		int diff = _nawCollection[guess]->compareTo(naw);
+		if (diff > 0) head = guess; // lower half (too high)
+		else if (diff < 0) tail = guess; // upper half (too low)
+		else return guess; // index found if compareTo(...) -> 0
+	}
+	return -1; // infinite loop failsafe
+}
+
+int NAWOrderedArray::add(const NAW& naw) {
+	int i;
+	// find insert index
+	for (i = 0; i < _nawCollectionSize; i++) {
+		if (_nawCollection[i]->compareTo(naw) > 0) break;
+	}
+	// shift elements
+	for (int k = _nawCollectionSize; k >= i; k--) {
+		if (k == 0) continue;
+		// std::cout << "moving [" << k-1 << "] to [" << k << "]" << std::endl;
+		_nawCollection[k] = _nawCollection[k-1];
+	}
+	_nawCollectionSize++;
+	// std::cout << "inserting into [" << i << "]" << std::endl;
+	_nawCollection[i] = new NAW(naw);
+	return i;
+}
+
+int NAWOrderedArray::remove(const NAW& naw) {
+	int i = find(naw);
+	// shift elements
+	for (int k = i; k < _nawCollectionSize; k++)
+		_nawCollection[k] = _nawCollection[k + 1];
+
+	_nawCollectionSize--;
+	return i;
+}
+
+int NAWOrderedArray::replace(const NAW& cOld, const NAW& cNew) {
+	bool opdrachtBeschrijvingIsDuidelijk = false; // true om de array opnieuw te sorteren na vervangen
+	int i = find(cOld);
+	if (i < 0) return -1;
+	if (opdrachtBeschrijvingIsDuidelijk == false) {
+		_nawCollection[i] = new NAW(cNew);
+	} else {
+		remove(cOld);
+		add(cNew);
+	}
+	return i;
+}
+
+void NAWOrderedArray::showAll() const {
+	for (unsigned i = 0; i < _nawCollectionSize; i++)
+		std::cout << *_nawCollection[i] << std::endl;
+}
diff --git a/algo1w1/NAWOrderedArray.h b/algo1w1/NAWOrderedArray.h
new file mode 100644
index 0000000..f21bb1a
--- /dev/null
+++ b/algo1w1/NAWOrderedArray.h
@@ -0,0 +1,22 @@
+#pragma once
+
+class NAW;
+
+class NAWOrderedArray {
+public:
+	NAWOrderedArray();
+	virtual ~NAWOrderedArray();
+
+public:
+	virtual int find(const NAW&) const;
+	virtual int add(const NAW&);
+	virtual int remove(const NAW&);
+	virtual int replace(const NAW& cOld, const NAW& cNew);
+
+public:
+	virtual void showAll() const;
+
+private:
+	const NAW* _nawCollection[20] = { nullptr };
+	unsigned _nawCollectionSize = 0;
+};
diff --git a/algo1w1/class-diagram.svg b/algo1w1/class-diagram.svg
index 0d0758a..f2740bc 100644
--- a/algo1w1/class-diagram.svg
+++ b/algo1w1/class-diagram.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="301.36mm" height="63.5mm"
- viewBox="0 0 1138 239"
+<svg width="262.996mm" height="67.4688mm"
+ viewBox="0 0 994 255"
  xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  version="1.2" baseProfile="tiny">
 <title>Qt SVG Document</title>
 <desc>Generated with Qt</desc>
@@ -18,592 +18,544 @@ font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal"
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,-22.2094,-57.6876)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,-183.56,-235.156)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffff" fill-opacity="1" stroke="none" transform="matrix(0.991736,0,0,0.991736,-22.2094,-57.6876)"
+<g fill="#ffffff" fill-opacity="1" stroke="none" transform="matrix(0.992218,0,0,0.992218,-183.56,-235.156)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<rect x="22.3945" y="58.1683" width="1140.68" height="242"/>
+<rect x="185" y="237" width="996" height="257"/>
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,-22.2094,-57.6876)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,-183.56,-235.156)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,-22.2094,-57.6876)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,-183.56,-235.156)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,-22.2094,-57.6876)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,-183.56,-235.156)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(-0.00412693,-0.991727,0.991727,-0.00412693,642.329,121.036)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.00753561,-0.992189,0.992189,0.00753561,499.086,125.609)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffff" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" transform="matrix(-0.00412693,-0.991727,0.991727,-0.00412693,642.329,121.036)"
+<g fill="#ffffff" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.00753561,-0.992189,0.992189,0.00753561,499.086,125.609)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <path vector-effect="non-scaling-stroke" fill-rule="evenodd" d="M-6,0 L0,10 L6,0 L-6,0"/>
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(-0.00412693,-0.991727,0.991727,-0.00412693,642.329,121.036)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.00753561,-0.992189,0.992189,0.00753561,499.086,125.609)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,473.659,98.2598)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,320.982,127.941)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,473.659,98.2598)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,320.982,127.941)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,473.659,98.2598)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,320.982,127.941)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="4.25" y="14" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >0..20</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="3.95313" y="14" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >_nawCollection</text>
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,473.659,98.2598)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,320.982,127.941)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,-22.2094,-57.6876)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,-183.56,-235.156)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.991736,0,0,0.991736,-22.2094,-57.6876)"
+<g fill="none" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.992218,0,0,0.992218,-183.56,-235.156)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<path vector-effect="non-scaling-stroke" fill-rule="evenodd" d="M495.394,180.94 L670.076,180.213"/>
+<path vector-effect="non-scaling-stroke" fill-rule="evenodd" d="M507,362.219 L688,363.594"/>
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,-22.2094,-57.6876)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,-183.56,-235.156)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,470.929,120.643)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,323.711,105.256)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,470.929,120.643)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,323.711,105.256)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,470.929,120.643)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,323.711,105.256)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="4.20313" y="14" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >-_nawCollection</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="4.25" y="14" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >0..20</text>
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,470.929,120.643)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,323.711,105.256)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<rect vector-effect="non-scaling-stroke" x="0" y="0" width="472" height="225"/>
+<rect vector-effect="non-scaling-stroke" x="0" y="0" width="482" height="255"/>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="205.641" y="12" font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
- >NAWArray</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="226.344" y="12" font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
+ >NAW</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<polyline fill="none" vector-effect="non-scaling-stroke" points="0,15 472,15 " />
+<polyline fill="none" vector-effect="non-scaling-stroke" points="0,15 482,15 " />
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="27" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >- _nawCollection : const NAW*[20]</text>
+ >- _naam : string</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="42" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >- _nawCollectionSize : unsigned</text>
+ >- _adres : string</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<polyline fill="none" vector-effect="non-scaling-stroke" points="0,45 472,45 " />
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="57" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >- _woonplaats : string</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
+<polyline fill="none" vector-effect="non-scaling-stroke" points="0,60 482,60 " />
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="57" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ NAWArray() «constructor»</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="72" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ ~NAWArray() «destructor»</text>
+ >+ NAW() «constructor»</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="87" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ add( : const NAW&amp;)</text>
+ >+ NAW( : const std::string&amp;,  : const std::string&amp;,  : const std::string&amp;) «constructor»</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="102" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ zoekOpEersteNaam( : const std::string&amp;) : int</text>
+ >+ ~NAW() «destructor»</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="117" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ zoekOpEersteAdres( : const std::string&amp;) : int</text>
+ >+ compareTo( : const NAW&amp;) : int</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="132" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ zoekOpEerstePlaats( : const std::string&amp;) : int</text>
+ >+ getNaam() : const std::string&amp;</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="147" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ zoekOpEersteAdresEnPlaats( : const std::string&amp;,  : const std::string&amp;) : int</text>
+ >+ getAdres() : const std::string&amp;</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="162" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ verwijderEersteMetNaam( : const std::string&amp;) : int</text>
+ >+ getPlaats() : const std::string&amp;</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="177" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ verwijderLaatsteMetNaam( : const std::string&amp;) : int</text>
+ >+ setNaam( : const std::string&amp;)</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="192" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ verwijderAllenMetNaam( : const std::string&amp;) : int</text>
+ >+ setAdres( : const std::string&amp;)</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="207" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ verwijderEersteMetAdresEnPlaats( : const std::string&amp;,  : const std::string&amp;) : int</text>
+ >+ setPlaats( : const std::string&amp;)</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="222" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ verwijderAllenMetAdresEnPlaats( : const std::string&amp;,  : const std::string&amp;) : int</text>
-</g>
-
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
-font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
-font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1,0,0,1,0,0)"
-font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,0.991736,11.1605)"
-font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
-font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
->
-</g>
-
-<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
-font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
->
-<rect vector-effect="non-scaling-stroke" x="0" y="0" width="482" height="240"/>
-</g>
-
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
-font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
->
-</g>
-
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
-font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
->
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="226.344" y="12" font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
- >NAW</text>
+ >+ heeftNaam( : const std::string&amp;) : bool</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<polyline fill="none" vector-effect="non-scaling-stroke" points="0,15 482,15 " />
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="237" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >+ heeftAdres( : const std::string&amp;) : bool</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="27" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >- _naam : string</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="252" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >+ heeftPlaats( : const std::string&amp;) : bool</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="42" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >- _adres : string</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1,0,0,1,0,0)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,509.008,0.992218)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="57" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >- _woonplaats : string</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<polyline fill="none" vector-effect="non-scaling-stroke" points="0,60 482,60 " />
+<rect vector-effect="non-scaling-stroke" x="0" y="0" width="321" height="150"/>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
-font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
+font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
-font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
+font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
 >
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="105.906" y="12" font-family="Sans Serif" font-size="12" font-weight="700" font-style="normal" 
+ >NAWOrderedArray</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
+<polyline fill="none" vector-effect="non-scaling-stroke" points="0,15 321,15 " />
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="72" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ NAW() «constructor»</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="87" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ NAW( : const std::string&amp;,  : const std::string&amp;,  : const std::string&amp;) «constructor»</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="27" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >- _nawCollection : const NAW*[20]</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="102" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ ~NAW() «destructor»</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="42" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >- _nawCollectionSize : unsigned</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#990000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="117" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ getNaam() : const std::string&amp;</text>
+<polyline fill="none" vector-effect="non-scaling-stroke" points="0,45 321,45 " />
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="132" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ getAdres() : const std::string&amp;</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="147" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ getPlaats() : const std::string&amp;</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="57" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >+ NAWOrderedArray() «constructor»</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="162" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ setNaam( : const std::string&amp;)</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="72" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >+ ~NAWOrderedArray() «destructor»</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="177" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ setAdres( : const std::string&amp;)</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="87" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >+ find( : const NAW&amp;) : int</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="192" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ setPlaats( : const std::string&amp;)</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="102" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >+ add( : const NAW&amp;) : int</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="207" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ heeftNaam( : const std::string&amp;) : bool</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="117" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >+ remove( : const NAW&amp;) : int</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="222" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ heeftAdres( : const std::string&amp;) : bool</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="132" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >+ replace(cOld : const NAW&amp;, cNew : const NAW&amp;) : int</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
-<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="237" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
- >+ heeftPlaats( : const std::string&amp;) : bool</text>
+<text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="5" y="147" font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
+ >+ showAll()</text>
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
 
-<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="#ffffc0" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
@@ -613,7 +565,7 @@ font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal"
 >
 </g>
 
-<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.991736,0,0,0.991736,652.246,0.991736)"
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.992218,0,0,0.992218,0.992218,48.6187)"
 font-family="Sans Serif" font-size="12" font-weight="400" font-style="normal" 
 >
 </g>
diff --git a/algo1w1/main.cpp b/algo1w1/main.cpp
index 9b737e5..80451a2 100644
--- a/algo1w1/main.cpp
+++ b/algo1w1/main.cpp
@@ -1,11 +1,21 @@
-#include "NAWArray.h"
+#include "NAWOrderedArray.h"
 #include "NAW.h"
 
+#include "IntOrderedArray.h"
+
 #include <iostream>
 #include <sstream>
 
+void testNAWOrderedArray();
+void testIntOrderedArray();
+
 int main() {
-	NAWArray array;
+	testNAWOrderedArray();
+	return 0;
+}
+
+void testNAWOrderedArray() {
+	NAWOrderedArray array;
 
 	for (int n = 0; n < 10; n++) {
 		std::stringstream naam, adres, plaats;
@@ -17,25 +27,27 @@ int main() {
 		array.add({ naam.str(), adres.str(), plaats.str() });
 	}
 
-	std::cout << array.zoekOpEersteNaam("avans 4") << std::endl;
-	std::cout << array.zoekOpEersteNaam("avans 34") << std::endl;
-	std::cout << array.zoekOpEersteAdres("onderwijsboulevard 7") << std::endl;
-	std::cout << array.zoekOpEersteAdres("onderwijsboulevard 37") << std::endl;
-	std::cout << array.zoekOpEerstePlaats("den bosch 2") << std::endl;
-	std::cout << array.zoekOpEerstePlaats("den bosch 83") << std::endl;
-	std::cout << array.zoekOpEersteAdresEnPlaats("onderwijsboulevard 7", "den bosch 7") << std::endl;
-	std::cout << array.zoekOpEersteAdresEnPlaats("onderwijsboulevard 7", "den bosch 8") << std::endl;
-
-	std::cout << array.verwijderEersteMetNaam("avans 4") << std::endl;
-	std::cout << array.verwijderEersteMetNaam("avans 34") << std::endl;
-	std::cout << array.verwijderLaatsteMetNaam("avans 5") << std::endl;
-	std::cout << array.verwijderLaatsteMetNaam("avans 34") << std::endl;
-	std::cout << array.verwijderAllenMetNaam("avans 5") << std::endl;
-	std::cout << array.verwijderAllenMetNaam("avans 34") << std::endl;
-	std::cout << array.verwijderEersteMetAdresEnPlaats("onderwijsboulevard 7", "den bosch 7") << std::endl;
-	std::cout << array.verwijderEersteMetAdresEnPlaats("onderwijsboulevard 7", "den bosch 8") << std::endl;
-	std::cout << array.verwijderAllenMetAdresEnPlaats("onderwijsboulevard 8", "den bosch 8") << std::endl;
-	std::cout << array.verwijderAllenMetAdresEnPlaats("onderwijsboulevard 9", "den bosch 8") << std::endl;
+	std::cout << array.find({"avans 7","onderwijsboulevard 7","den bosch 7"}) << std::endl;
+	std::cout << array.find({"avans 7","onderwijsboulevard 8","den bosch 9"}) << std::endl;
+	std::cout << array.add({"avans 7","onderwijsboulevard 8","den bosch 9"}) << std::endl;
+//	std::cout << array.add({"avans 7","onderwijsboulevard 8","den bosch 9"}) << std::endl; // niet-gedefinieerd requirement...
+	std::cout << array.remove({"avans 7","onderwijsboulevard 8","den bosch 9"}) << std::endl;
+	std::cout << array.remove({"avans 7","onderwijsboulevard 8","den bosch 9"}) << std::endl;
+	std::cout << array.replace({"avans 7","onderwijsboulevard 7","den bosch 7"}, {"avans 17","onderwijsboulevard 18","den bosch 19"}) << std::endl;
+	std::cout << array.replace({"avans 1","onderwijsboulevard 2","den bosch 3"}, {"avans 17","onderwijsboulevard 18","den bosch 19"}) << std::endl;
 
-	return 0;
+	array.showAll();
+}
+
+void testIntOrderedArray() {
+	IntOrderedArray array;
+
+	for (int n = 1; n <= 10; n++) {
+		if ((n&1) == 0)
+			array.quickInsert(n+10);
+		else
+			array.quickInsert(n);
+	}
+
+	array.showAll();
 }