|_selfk> now works in FnOp

GarryMorrison · Mar 2, 2019 · 3fcf86d · 3fcf86d
1 parent 3b52613
commit 3fcf86d
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 1 deletion.
diff --git a/include/BaseOp.h b/include/BaseOp.h
@@ -12,6 +12,7 @@ class BaseOp {
         virtual const std::string to_string() const = 0;
         virtual Sequence Compile(ContextList& context, const Sequence& seq) const = 0;
         virtual Sequence Compile(ContextList& context, const Sequence& seq, const ulong label_idx) const = 0;
+        virtual Sequence Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const = 0;
 };
 
 #endif

diff --git a/include/BracketOp.h b/include/BracketOp.h
@@ -19,6 +19,7 @@ class BracketOp : public BaseOp {
         void push(OpSeq &op_seq) { op_seq_vec.push_back(op_seq); }
         Sequence Compile(ContextList& context, const Sequence& seq) const;
         Sequence Compile(ContextList& context, const Sequence& seq, const ulong label_idx) const;
+        Sequence Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const;
         const std::string to_string() const;
 
 };

diff --git a/include/EmptyOp.h b/include/EmptyOp.h
@@ -15,6 +15,7 @@ class EmptyOp : public BaseOp {
         EmptyOp() { }
         Sequence Compile(ContextList& context, const Sequence& seq) const { return seq; };
         Sequence Compile(ContextList& context, const Sequence& seq, const ulong label_idx) const { return seq; }
+        Sequence Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const { return seq; }
         const std::string to_string() const { std::string s = ""; return s; };
 
 };

diff --git a/include/FnOp.h b/include/FnOp.h
@@ -21,6 +21,7 @@ class FnOp : public BaseOp {
         void push(OpRule *op_rule) { op_rules.push_back(op_rule); }
         Sequence Compile(ContextList& context, const Sequence& seq) const;
         Sequence Compile(ContextList& context, const Sequence& seq, const ulong label_idx) const;
+        Sequence Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const;
         const std::string to_string() const;
 
 };

diff --git a/include/NumericOp.h b/include/NumericOp.h
@@ -16,6 +16,7 @@ class NumericOp : public BaseOp {
         NumericOp(const double d) { value = d; };
         Sequence Compile(ContextList& context, const Sequence& seq) const;
         Sequence Compile(ContextList& context, const Sequence& seq, const ulong label_idx) const;
+        Sequence Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const;
         const std::string to_string() const;
 
 };

diff --git a/include/OpSeq.h b/include/OpSeq.h
@@ -25,6 +25,7 @@ class OpSeq : public BaseOp {
         void append(BaseOp* b_op);
         Sequence Compile(ContextList& context, const Sequence& seq) const;
         Sequence Compile(ContextList& context, const Sequence& seq, const ulong label_idx) const;
+        Sequence Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const;
         const std::string to_string() const;
 
 };

diff --git a/include/PoweredOp.h b/include/PoweredOp.h
@@ -12,6 +12,7 @@ class PoweredOp : public BaseOp {
         PoweredOp(BaseOp* base_op, const unsigned int power);
         Sequence Compile(ContextList& context, const Sequence& seq) const;
         Sequence Compile(ContextList& context, const Sequence& seq, const ulong label_idx) const;
+        Sequence Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const;
         const std::string to_string() const;
 };
 

diff --git a/include/SimpleOp.h b/include/SimpleOp.h
@@ -18,6 +18,7 @@ class SimpleOp : public BaseOp {
         SimpleOp(const std::string& s) { op_idx = ket_map.get_idx(s); }
         Sequence Compile(ContextList& context, const Sequence& seq) const;
         Sequence Compile(ContextList& context, const Sequence& seq, const ulong label_idx) const;
+        Sequence Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const;
         const std::string to_string() const;
 
 };

diff --git a/src/BracketOp.cpp b/src/BracketOp.cpp
@@ -39,6 +39,22 @@ Sequence BracketOp::Compile(ContextList& context, const Sequence& seq, const ulo
     return seq2;
 }
 
+Sequence BracketOp::Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const {
+    Sequence seq2;
+    for (const auto &op_seq : op_seq_vec) {
+        Sequence compiled_seq = op_seq.Compile(context, seq, args);
+        switch (op_seq.symbol_type()) {
+            case SPLUS: { seq2.add(compiled_seq); break; }
+            case SMINUS: { seq2.add(compiled_seq); break; }
+            case SSEQ: { seq2.append(compiled_seq); break; }
+            case SMERGE: { seq2.merge(compiled_seq); break; }
+            case SMERGE2: { seq2.merge(compiled_seq, " "); break; }
+        }
+    }
+    std::cout << "BracketOp::seq2: " << seq2.to_string() << std::endl;
+    return seq2;
+}
+
 
 const std::string BracketOp::to_string() const {
     std::string s = "(";

diff --git a/src/FnOp.cpp b/src/FnOp.cpp
@@ -110,6 +110,58 @@ Sequence FnOp::Compile(ContextList& context, const Sequence& seq, const ulong la
     return brule->Compile(context, args);
 }
 
+// find a way to remove this duplication!!
+Sequence FnOp::Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& input_args) const {
+    std::vector<Sequence> args;
+    args.push_back(seq);
+    for (const auto op_rule: op_rules) {
+        Sequence tmp = op_rule->Compile(context, input_args);
+        args.push_back(tmp);
+        std::cout << "arg: " << tmp.to_string() << std::endl;
+    }
+    switch (op_rules.size()) {  // is it possible to tidy up this section?
+        case 1: { if (fn_map.whitelist_1.find(op_idx) != fn_map.whitelist_1.end()) {
+                      auto our_fn = fn_map.whitelist_1[op_idx];
+                      return our_fn(args[0], args[1]);
+                  } else if (fn_map.context_whitelist_1.find(op_idx) != fn_map.context_whitelist_1.end()) {
+                      auto our_fn = fn_map.context_whitelist_1[op_idx];
+                      return our_fn(context, args[0], args[1]);
+                  }
+                  break;
+                }
+        case 2: { if (fn_map.whitelist_2.find(op_idx) != fn_map.whitelist_2.end()) {
+                      auto our_fn = fn_map.whitelist_2[op_idx];
+                      return our_fn(args[0], args[1], args[2]);
+                  } else if (fn_map.context_whitelist_2.find(op_idx) != fn_map.context_whitelist_2.end()) {
+                      auto our_fn = fn_map.context_whitelist_2[op_idx];
+                      return our_fn(context, args[0], args[1], args[2]);
+                  }
+                  break;
+                }
+        case 3: { if (fn_map.whitelist_3.find(op_idx) != fn_map.whitelist_3.end()) {
+                      auto our_fn = fn_map.whitelist_3[op_idx];
+                      return our_fn(args[0], args[1], args[2], args[3]);
+                  } else if (fn_map.context_whitelist_3.find(op_idx) != fn_map.context_whitelist_3.end()) {
+                      auto our_fn = fn_map.context_whitelist_3[op_idx];
+                      return our_fn(context, args[0], args[1], args[2], args[3]);
+                  }
+                  break;
+                }
+        case 4: { if (fn_map.whitelist_4.find(op_idx) != fn_map.whitelist_4.end()) {
+                      auto our_fn = fn_map.whitelist_4[op_idx];
+                      return our_fn(args[0], args[1], args[2], args[3], args[4]);
+                  } else if (fn_map.context_whitelist_4.find(op_idx) != fn_map.context_whitelist_4.end()) {
+                      auto our_fn = fn_map.context_whitelist_4[op_idx];
+                      return our_fn(context, args[0], args[1], args[2], args[3], args[4]);
+                  }
+                  break;
+                }
+    }
+    BaseRule *brule = context.fn_recall(op_idx, op_rules.size());
+    std::cout << "brule: " << brule->to_string() << std::endl;
+    return brule->Compile(context, args);
+}
+
 
 const std::string FnOp::to_string() const {
     std::string s = ket_map.get_str(op_idx) + "(";

diff --git a/src/NumericOp.cpp b/src/NumericOp.cpp
@@ -16,6 +16,12 @@ Sequence NumericOp::Compile(ContextList& context, const Sequence& seq, const ulo
     return result;
 }
 
+Sequence NumericOp::Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const {
+    Sequence result(seq);
+    result.multiply(value);
+    return result;
+}
+
 
 const std::string NumericOp::to_string() const {
     return std::string(std::to_string(value));  // why?

diff --git a/src/OpSeq.cpp b/src/OpSeq.cpp
@@ -37,6 +37,15 @@ Sequence OpSeq::Compile(ContextList& context, const Sequence& seq, const ulong l
     return result;
 }
 
+Sequence OpSeq::Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const {
+    Sequence result = seq;
+    for (auto it = op_seq.rbegin(); it != op_seq.rend(); ++it) {
+        result = (*it)->Compile(context, result, args);
+    }
+    if (op_symbol == SMINUS) { result.multiply(-1); } // not 100% sure this should be here.
+    return result;
+}
+
 
 const std::string OpSeq::to_string() const {
     std::string s = "";

diff --git a/src/PoweredOp.cpp b/src/PoweredOp.cpp
@@ -25,6 +25,14 @@ Sequence PoweredOp::Compile(ContextList& context, const Sequence& seq, const ulo
     return result;
 }
 
+Sequence PoweredOp::Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const {
+    Sequence result = seq;
+    for (unsigned int i = 0; i < pow; i++) {
+        result = b_op->Compile(context, result, args);
+    }
+    return result;
+}
+
 
 const std::string PoweredOp::to_string() const {
     std::string s = "";

diff --git a/src/SimpleOp.cpp b/src/SimpleOp.cpp
@@ -57,6 +57,10 @@ Sequence SimpleOp::Compile(ContextList& context, const Sequence& seq, const ulon
     return this->Compile(context, seq);
 }
 
+Sequence SimpleOp::Compile(ContextList& context, const Sequence& seq, const std::vector<Sequence>& args) const {
+    return this->Compile(context, seq);
+}
+
 
 const std::string SimpleOp::to_string() const {
     return ket_map.get_str(op_idx);

diff --git a/src/SingleOpRule.cpp b/src/SingleOpRule.cpp
@@ -33,7 +33,7 @@ Sequence SingleOpRule::Compile(ContextList& context, const ulong label_idx) cons
 Sequence SingleOpRule::Compile(ContextList& context, const std::vector<Sequence>& args) const {
     Sequence seq;
     Sequence b_seq = b_rule->Compile(context, args);
-    seq = op_seq->Compile(context, b_seq);
+    seq = op_seq->Compile(context, b_seq, args);
     return seq;
 }
 

diff --git a/sw-examples/add.sw b/sw-examples/add.sw
@@ -0,0 +1,8 @@
+foo (*,*) #=> 3|_self0> + 5|_self1> + 7|_self2>
+
+the |result> => foo(|a>, |b>) |x>
+
+add (*,*) #=> arithmetic(|_self1>, |+>, |_self2>) |>
+
+the |2nd result> => add(|3>, |5>) |>
+