From 04d3e31dbcb2c7b99525b57a418a31ef87130cc7 Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Fri, 5 Apr 2024 21:02:37 +0300
Subject: [PATCH] PISet fix

---
 libs/main/containers/piset.h |  2 +-
 main.cpp                     | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/libs/main/containers/piset.h b/libs/main/containers/piset.h
index 6eb413dd..431f41cf 100644
--- a/libs/main/containers/piset.h
+++ b/libs/main/containers/piset.h
@@ -210,7 +210,7 @@ public:
 
 	//! Intersect set with "v"
 	PISet<T> & intersect(const PISet<T> & v) {
-		_CSet::removeWhere([&v](const T & k, uchar) { return v.contains(k); });
+		_CSet::removeWhere([&v](const T & k, uchar) { return !v.contains(k); });
 		return *this;
 	}
 
diff --git a/main.cpp b/main.cpp
index 8dedeecb..ba615963 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,20 +5,22 @@
 #include "piliterals_time.h"
 #include "pimathbase.h"
 #include "pip.h"
-#include "pivaluetree.h"
+#include "pivaluetree_conversions.h"
 
 using namespace PICoutManipulators;
 
 
 int main(int argc, char * argv[]) {
-	// PICodeParser cp;
-	// cp.parseFile("kmm_types.h", false);
-	piCout << (1_Hz * 100).toSystemTime().toSeconds();
-	piCout << (1_Hz * 100);
-	piCout << (1_Hz + 10_GHz);
-	piCout << (100_Hz + 1_KHz - 10_Hz);
-	piCout << PISystemTime::Frequency::fromSystemTime({0, 200000000});
-	piCout << PISystemTime::Frequency::fromSystemTime(25_ms);
-	piCout << PISystemTime::Frequency::fromSystemTime(25_ms).toSystemTime().toMilliseconds();
+	/*PISerial ser;
+	ser.setSpeed(PISerial::S115200);
+	piCout << ser.open("COM15", PIIODevice::ReadWrite);
+	CONNECTL(&ser, threadedReadEvent, ([](const uchar * data, ssize_t size) { piCout << PIByteArray(data, size); }));
+	ser.startThreadedRead();
+	(2_s).sleep();
+	ser.stopAndWait();*/
+	PISet<int> set = {1, 3, 4};
+	set |= PISet<int>{2, 4};
+	set -= PISet<int>{2};
+	piCout << set << (set & PISet<int>{1, 2, 4});
 	return 0;
 }