Improved iterators

Author: kevinlano

libraries/OclIterator.cpp

@@ -191,6 +191,17 @@ OclIterator<T>* newOclIterator_Function(function<T (int)> f)
     return res;
 }
 
+template<class T>
+OclIterator<T> OclIterator<T>::trySplit()
+{
+  vector<T>* firstpart = UmlRsdsLib<T>::subrange(elements, 1, position - 1);
+  elements = UmlRsdsLib<T>::subrange(elements, position, elements->size());
+  position = 0;
+  markedPosition = 0;
+  return OclIterator.newOclIterator_Sequence(firstpart);
+}
+
+
 template<class T>
 T OclIterator<T>::getCurrent()
 {
@@ -251,6 +262,29 @@ T OclIterator<T>::next()
     return ocliteratorx->getCurrent();
 }
 
+template<class T>
+bool OclIterator<T>::tryAdvance(function<void*(void*)> f)
+{
+    if (this->position + 1 <= this->elements->size())
+    {
+        void* x = this->next();
+        f(x);
+        return true;
+    }
+    return false;
+}
+
+
+template<class T>
+void OclIterator<T>::forEachRemaining(function<void*(void*)> f)
+{
+  vector<T>* remainingElements = UmlRsdsLib<T>::subrange(elements, position, elements->size());
+  for (int i = 0; i < remainingElements->size(); i++)
+  {
+      T x = remainingElements->at(i); 
+      f(x);
+  }
+}
 
 template<class T>
 T OclIterator<T>::previous()

libraries/OclIterator.hpp

@@ -116,6 +116,8 @@ class OclIterator
 
     static OclIterator* newOclIterator_Function(function<T(int)> f);
 
+    OclIterator<T> trySplit();
+
     T getCurrent();
 
     void set(T x);
@@ -128,6 +130,10 @@ class OclIterator
 
     OclIteratorResult<T> nextResult();
 
+    bool tryAdvance(function<void* (void*)> f);
+
+    void forEachRemaining(function<void* (void*)> f); 
+
     T previous();
 
     T at(int i);

libraries/matrixlib.py

@@ -0,0 +1,22 @@
+import numpy as np
+
+
+class MatrixLib :
+
+  def rowMult(s, m) :   
+    result = []
+    for i in range(0, len(s)) :
+      sum = 0 
+      for k in range(0, len(m)) : 
+        sum = sum + s[k]*(m[k][i])
+      result.append(sum)
+    return result
+
+  def matrixMultiplication(m1, m2) : 
+     m1array = np.array(m1)
+     m2array = np.array(m2)
+     res = np.matmul(m1array, m2array)
+     return res.tolist()
+
+
+print(MatrixLib.matrixMultiplication([[1,2], [3,4]], [[5,6], [7,8]]))