Added partial boolean flag to zoom.

Author: dpbutter

core/algorithms/zoom.cc

@@ -6,8 +6,8 @@
 
 using namespace cadabra;
 
-zoom::zoom(const Kernel& k, Ex& e, Ex& rules_)
-	: Algorithm(k, e), rules(rules_)
+zoom::zoom(const Kernel& k, Ex& e, Ex& rules_, bool partial)
+	: Algorithm(k, e), rules(rules_), partial(partial)
 	{
 	// Convert rules into a list (if it isn't already)
 	rules = cadabra::make_list(rules);
@@ -66,7 +66,7 @@ Algorithm::result_t zoom::apply(iterator& it)
    // Wrap all things which we want to remove from view in an
 	// \ldots node.
 
-	substitute subs(kernel, tr, rules);
+	substitute subs(kernel, tr, rules, partial);
 	sibling_iterator sib=tr.begin(it);
 	bool hiding=false;
 	sibling_iterator current_ldots=tr.end(it);

core/algorithms/zoom.hh

@@ -7,7 +7,7 @@ namespace cadabra {
 
 	class zoom : public Algorithm {
 		public:
-			zoom(const Kernel& k, Ex& e, Ex& r);
+			zoom(const Kernel& k, Ex& e, Ex& r, bool partial = true);
 
 			virtual bool     can_apply(iterator) override;
 			virtual result_t apply(iterator&) override;
@@ -17,6 +17,8 @@ namespace cadabra {
 
 			std::vector<sibling_iterator> to_erase;
 			std::vector<Ex::path_t>       to_keep;
+
+			bool partial;
 		};
 
 	}

core/pythoncdb/py_algorithms.cc

@@ -133,7 +133,7 @@ namespace cadabra {
 		def_algo<substitute, Ex, bool>(m, "substitute", true, false, 0, py::arg("rules"), py::arg("partial") = true);
 		def_algo<take_match, Ex>(m, "take_match", true, false, 0, py::arg("rules"));
 		def_algo<replace_match>(m, "replace_match", false, false, 0);
-		def_algo<zoom, Ex>(m, "zoom", true, false, 0, py::arg("rules"));
+		def_algo<zoom, Ex, bool>(m, "zoom", true, false, 0, py::arg("rules"), py::arg("partial") = true);
 		def_algo_preorder<unzoom>(m, "unzoom", true, false, 0);
 		def_algo<untrace>(m, "untrace", true, false, 0);
 		def_algo<rewrite_indices, Ex, Ex>(m, "rewrite_indices", true, false, 0, py::arg("preferred"), py::arg("converters"));