X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/f394d7d95de33fea2b476248ac129488643beb77..b733cd4a9d1fcc19c3652b17fbd3065d0e0a72c7:/src/clave_fija.cpp

diff --git a/src/clave_fija.cpp b/src/clave_fija.cpp
index 67edc4c..d947e2a 100644
--- a/src/clave_fija.cpp
+++ b/src/clave_fija.cpp
@@ -2,26 +2,29 @@
 #include <string>
 #include "clave_fija.h"
 
-ClaveFija::ClaveFija (int n)
+ClaveFija::ClaveFija (int n, uint bd)
 {
 	data = n;
+	block_data = bd;
 }
 
 ClaveFija::ClaveFija (uchar *n)
 {
 	memcpy (&data, n, sizeof(int));
+	memcpy (&block_data, n+sizeof(int), sizeof(int));
 }
 
 uint ClaveFija::Size () const
 {
-	return sizeof (int);
+	return sizeof (int)+sizeof(uint);
 }
 
 uchar *ClaveFija::ToArray () const
 {
 	uchar *out;
-	out = new uchar[sizeof(int)];
+	out = new uchar[Size ()];
 	memcpy (out, &data, sizeof(int));
+	memcpy (out+sizeof (int), &block_data, sizeof(int));
 	return out;
 }
 
@@ -31,3 +34,33 @@ Clave *ClaveFija::Clone () const
 	return k;
 }
 
+bool ClaveFija::operator < (const Clave &c) const
+{
+	return data < ((ClaveFija&)c).data;
+}
+
+bool ClaveFija::operator == (const Clave &c) const
+{
+	return data == ((ClaveFija&)c).data;
+}
+		
+uchar *ClaveFija::ToRaw (uint &size) const
+{
+	std::stringstream ss;
+
+	ss << "[";
+	ss << data;
+	ss << "]";
+	ss << "[";
+	ss << block_data;
+	ss << "]";
+
+	std::string s = ss.str ();
+
+	uchar *out = new uchar[s.size ()];
+	memcpy (out, s.c_str (), s.size ());
+
+	size = s.size ();
+	return out;
+}
+