git-svn-id: svn://db.shs.com.ru/pip@299 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

src/containers/piset.h

@@ -53,7 +53,20 @@ public:
 	
 	//! Contructs set with elements "v0", "v1", "v2" and "v3"
 	PISet(const T & v0, const T & v1, const T & v2, const T & v3) {_CSet::insert(v0, 0); _CSet::insert(v1, 0); _CSet::insert(v2, 0); _CSet::insert(v3, 0);}
-	
+
+	//! Contructs set from vector of elements
+	PISet(const PIVector<T> & values) {
+		if (values.isEmpty()) return;
+		//_CSet::pim_content.resize(values.size_s());
+		//_CSet::pim_index.resize(values.size_s());
+		for (int i = 0; i < values.size_s(); ++i) {
+			//_CSet::pim_index[i].index = i;
+			//_CSet::pim_index[i].key = values[i];
+			_CSet::insert(values[i], 0);
+		}
+		//_CSet::_sort();
+	}
+
 	typedef T key_type;
 	
 	PISet<T> & operator <<(const T & t) {_CSet::insert(t, 0); return *this;}
@@ -64,9 +77,41 @@ public:
 	
 	//! Returns if element "t" exists in this set
 	PISet<T> & remove(const T & t) {_CSet::remove(t); return *this;}
-	
+
+	//! Unite set with "v"
+	PISet<T> & unite(const PISet<T> & v) {
+		for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i)
+			_CSet::insert(i->first, 0);
+		return *this;
+	}
+
+	//! Subtract set with "v"
+	PISet<T> & subtract(const PISet<T> & v) {
+		for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i)
+			_CSet::remove(i->first);
+		return *this;
+	}
+
 	//! Returns content of set as PIVector
 	PIVector<T> toVector() const {PIVector<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << (*i).first; return ret;}
 };
 
+
+template<typename Type>
+inline PICout operator <<(PICout s, const PISet<Type> & v) {
+	s.space();
+	s.setControl(0, true);
+	s << "{";
+	bool first = true;
+	for (typename PIMap<Type, uchar>::const_iterator i = v.begin(); i != v.end(); ++i) {
+		if (!first)
+			s << ", ";
+		first = false;
+		s << i->first;
+	}
+	s << "}";
+	s.restoreControl();
+	return s;
+}
+
 #endif // PISET_H