Making sure that C++ Set and Relation methods return pointers from a new set/map...

diff --git a/common.mk b/common.mk
index fdf6b882f770e58a040be6f4a5d7889c97b72257..e5fcbb8c6091a1580af320f18c443de55c179ffc 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,5 +1,6 @@
 G++ := g++
 ARM_G++ := arm-linux-gnueabihf-g++
 G++ := g++
 ARM_G++ := arm-linux-gnueabihf-g++

+#ARM_G++ := arm-linux-gnueabi-g++

 JAVA := java
 JAR := jar
 JAVADOC := javadoc
 JAVA := java
 JAR := jar
 JAVADOC := javadoc

diff --git a/iotjava/iotruntime/cpp/iotslave/Makefile b/iotjava/iotruntime/cpp/iotslave/Makefile
index 4157921c7f8874fbddf043dfddea22ac72e5d106..1d73cca6bf0b2b3105cfdb8b5e3a1eab3a53ed95 100755 (executable)
--- a/iotjava/iotruntime/cpp/iotslave/Makefile
+++ b/iotjava/iotruntime/cpp/iotslave/Makefile
@@ -22,6 +22,10 @@ cpp-arm:
        $(ARM_G++) $(GCCFLAGS) -o IoTSlave.o IoTSlave.cpp $(INCLUDE) $(CCCLINKERFLAGS)
        cp IoTSlave.o $(BASE)/bin/iotruntime/slave/
 
        $(ARM_G++) $(GCCFLAGS) -o IoTSlave.o IoTSlave.cpp $(INCLUDE) $(CCCLINKERFLAGS)
        cp IoTSlave.o $(BASE)/bin/iotruntime/slave/
 

+PHONY += cpp-test
+cpp-test:
+       $(G++) $(GCCFLAGS) -o SetRelationTest.o SetRelationTest.cpp $(INCLUDE) $(CCCLINKERFLAGS)
+

 PHONY += run
 run:
        java IoTSlave
 PHONY += run
 run:
        java IoTSlave

diff --git a/iotjava/iotruntime/cpp/iotslave/SetRelationTest.cpp b/iotjava/iotruntime/cpp/iotslave/SetRelationTest.cpp
new file mode 100644 (file)
index 0000000..36769a5
--- /dev/null
+++ b/iotjava/iotruntime/cpp/iotslave/SetRelationTest.cpp
@@ -0,0 +1,48 @@
+#include <iostream>
+#include "IoTSet.hpp"
+#include "IoTRelation.hpp"
+
+using namespace std;
+
+int main ()
+{
+       unordered_set<string> myset = { "red","green","blue" };
+
+       IoTSet<string> iotset(&myset);
+
+       unordered_set<string>::const_iterator got = iotset.find ("red");
+
+       if ( got == iotset.end() )
+               cout << "not found in myset" << endl;
+       else
+               cout << *got << " is in myset" << endl;
+
+       cout << "size: " << iotset.size() << endl;
+
+       unordered_multimap<string,string> mymap = {
+               {"mom","church"},
+               {"mom","college"},
+               {"dad","office"},
+               {"bro","school"} };
+
+       unordered_set<string>* retset = iotset.values();
+       cout << "Returned set: " << retset->size() << endl;
+       retset->erase("red");
+       cout << "Returned set: " << retset->size() << endl;
+       cout << "Original set: " << myset.size() << endl;
+
+       //cout << "one of the values for 'mom' is: ";
+       //cout << mymap.find("mom")->second;
+       //cout << endl;
+       IoTRelation<string,string> iotrel(&mymap);
+
+       std::pair<unordered_multimap<string,string>::const_iterator, 
+               unordered_multimap<string,string>::const_iterator> ret;
+       ret = iotrel.equal_range("mom");
+       for (std::unordered_multimap<string,string>::const_iterator it=ret.first; it!=ret.second; ++it)
+               cout << ' ' << it->second << endl;
+
+       cout << "size: " << iotrel.size() << endl;
+
+       return 0;
+}

diff --git a/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp b/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp
index 372f6951327e17dd08f4bc95cd34418ca3630686..ad1f8bfcf4c544545453b4baf59793b287fd93e0 100644 (file)
--- a/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp
+++ b/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp
@@ -69,7 +69,7 @@ IoTRelation<K,V>::~IoTRelation() {
 template <class K,class V>
 typename unordered_multimap<K,V>::const_iterator IoTRelation<K,V>::find(const K& k) {
 
 template <class K,class V>
 typename unordered_multimap<K,V>::const_iterator IoTRelation<K,V>::find(const K& k) {
 

-       return rel->find(k);
+       return (new unordered_multimap<K,V>(*rel))->find(k);

 }
 
 
 }
 
 


@@ -79,7 +79,7 @@ typename unordered_multimap<K,V>::const_iterator IoTRelation<K,V>::find(const K&
 template <class K,class V>
 typename unordered_multimap<K,V>::const_iterator IoTRelation<K,V>::begin() {
 
 template <class K,class V>
 typename unordered_multimap<K,V>::const_iterator IoTRelation<K,V>::begin() {
 

-       return rel->begin();
+       return (new unordered_multimap<K,V>(*rel))->begin();

 }
 
 
 }
 
 


@@ -89,7 +89,7 @@ typename unordered_multimap<K,V>::const_iterator IoTRelation<K,V>::begin() {
 template <class K,class V>
 typename unordered_multimap<K,V>::const_iterator IoTRelation<K,V>::end() {
 
 template <class K,class V>
 typename unordered_multimap<K,V>::const_iterator IoTRelation<K,V>::end() {
 

-       return rel->end();
+       return (new unordered_multimap<K,V>(*rel))->end();

 }
 
 
 }
 
 


@@ -101,7 +101,7 @@ std::pair<typename unordered_multimap<K,V>::const_iterator,
        typename unordered_multimap<K,V>::const_iterator> 
        IoTRelation<K,V>::equal_range(const K& k) {
 
        typename unordered_multimap<K,V>::const_iterator> 
        IoTRelation<K,V>::equal_range(const K& k) {
 

-       return rel->equal_range(k);
+       return (new unordered_multimap<K,V>(*rel))->equal_range(k);

 }
 
 
 }
 
 

diff --git a/iotjava/iotruntime/cpp/setrelation/IoTSet.hpp b/iotjava/iotruntime/cpp/setrelation/IoTSet.hpp
index 60f34f757d4d3a40026c3add2a164bb4804343fe..0c45ca8ab42e56071aab85722a05374274dea42d 100644 (file)
--- a/iotjava/iotruntime/cpp/setrelation/IoTSet.hpp
+++ b/iotjava/iotruntime/cpp/setrelation/IoTSet.hpp
@@ -64,7 +64,7 @@ IoTSet<T>::~IoTSet() {
 template <class T>
 typename unordered_set<T>::const_iterator IoTSet<T>::find(const T& k) {
 
 template <class T>
 typename unordered_set<T>::const_iterator IoTSet<T>::find(const T& k) {
 

-       return set->find(k);
+       return (new unordered_set<T>(*set))->find(k);

 }
 
 
 }
 
 


@@ -74,7 +74,7 @@ typename unordered_set<T>::const_iterator IoTSet<T>::find(const T& k) {
 template <class T>
 typename unordered_set<T>::const_iterator IoTSet<T>::begin() {
 
 template <class T>
 typename unordered_set<T>::const_iterator IoTSet<T>::begin() {
 

-       return set->begin();
+       return (new unordered_set<T>(*set))->begin();

 }
 
 
 }
 
 


@@ -84,7 +84,7 @@ typename unordered_set<T>::const_iterator IoTSet<T>::begin() {
 template <class T>
 typename unordered_set<T>::const_iterator IoTSet<T>::end() {
 
 template <class T>
 typename unordered_set<T>::const_iterator IoTSet<T>::end() {
 

-       return set->end();
+       return (new unordered_set<T>(*set))->end();

 }
 
 
 }