mirror of https://github.com/KLayout/klayout.git
Adding string serialization "from_s" for objects with properties (CAUTION: side effect!)
Problem was that "to_s" did not deliver a parsable string for the properties. This is fixed, but the format of the properties part of the string changes.
This commit is contained in:
Matthias Koefferlein
parent
77fb74e072
commit
c85be6bce5
|
|
@ -271,7 +271,7 @@ public:
|
|||
{
|
||||
std::string s = Obj::to_string ();
|
||||
s += " props=";
|
||||
s += db::properties (properties_id ()).to_dict_var ().to_string ();
|
||||
s += db::properties (properties_id ()).to_dict_var ().to_parsable_string ();
|
||||
return s;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,6 +34,15 @@
|
|||
namespace gsi
|
||||
{
|
||||
|
||||
template <class T>
|
||||
static T *from_string (const std::string &s)
|
||||
{
|
||||
tl::Extractor ex (s);
|
||||
std::unique_ptr<T> t (new T ());
|
||||
ex.read (*t.get ());
|
||||
return t.release ();
|
||||
}
|
||||
|
||||
template <class T>
|
||||
static T *from_bytes (const std::vector<char> &s)
|
||||
{
|
||||
|
|
@ -265,6 +274,12 @@ static gsi::Methods properties_support_methods ()
|
|||
"If no property with that key does not exist, it will return nil. Using that method is more "
|
||||
"convenient than using the layout object and the properties ID to retrieve the property value. "
|
||||
) +
|
||||
gsi::constructor ("from_s", &from_string<T>, gsi::arg ("s"),
|
||||
"@brief Creates an object from a binary serialization\n"
|
||||
"Creates the object from a binary representation (as returned by \\to_bytes)\n"
|
||||
"\n"
|
||||
"This method has been added in version 0.30.9.\n"
|
||||
) +
|
||||
gsi::method ("to_s", (std::string (T::*) () const) &T::to_string,
|
||||
"@brief Returns a string representing the object\n"
|
||||
) +
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ TEST(1)
|
|||
|
||||
db::PolygonWithProperties pwp (db::Polygon (db::Box (0, 0, 100, 200)), db::properties_id (ps));
|
||||
|
||||
EXPECT_EQ (pwp.to_string (), "(0,0;0,200;100,200;100,0) props={1=>one,key=>42}");
|
||||
EXPECT_EQ (pwp.to_string (), "(0,0;0,200;100,200;100,0) props={#1=>'one','key'=>##42}");
|
||||
|
||||
db::PolygonWithProperties pwp2;
|
||||
|
||||
|
|
@ -43,11 +43,11 @@ TEST(1)
|
|||
|
||||
EXPECT_EQ (ex.try_read (pwp2), false);
|
||||
|
||||
s = " (0,0;0,200;100,200;100,0) props= {1 => \"one\", key => 42} ";
|
||||
s = " (0,0;0,200;100,200;100,0) props= {#1 => \"one\", 'key' => ##42} ";
|
||||
ex = tl::Extractor (s.c_str ());
|
||||
|
||||
EXPECT_EQ (ex.try_read (pwp2), true);
|
||||
EXPECT_EQ (pwp2.to_string (), "(0,0;0,200;100,200;100,0) props={1=>one,key=>42}");
|
||||
EXPECT_EQ (pwp2.to_string (), "(0,0;0,200;100,200;100,0) props={#1=>'one','key'=>##42}");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,5 +84,5 @@ TEST(1_RegionToEdgesProcessor)
|
|||
|
||||
result.clear ();
|
||||
db::PolygonToEdgeProcessor (db::PolygonToEdgeProcessor::StepIn).process (poly, result);
|
||||
EXPECT_EQ (tl::join (result.begin (), result.end (), ";"), "(0,1000;1000,1000) props={net=>17};(2000,2000;2000,1000) props={net=>17}");
|
||||
EXPECT_EQ (tl::join (result.begin (), result.end (), ";"), "(0,1000;1000,1000) props={'net'=>#17};(2000,2000;2000,1000) props={'net'=>#17}");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2253,7 +2253,7 @@ TEST(52_PropertiesDeep)
|
|||
EXPECT_EQ (s.at_end (), false);
|
||||
|
||||
// polygons are merged with "maximum" property value
|
||||
EXPECT_EQ (db::PolygonWithProperties (*s, s.prop_id ()).to_string (), "(0,0;0,200;1,200;1,202;10,202;10,220;110,220;110,212;111,212;111,12;101,12;101,2;100,2;100,0) props={id=>42}");
|
||||
EXPECT_EQ (db::PolygonWithProperties (*s, s.prop_id ()).to_string (), "(0,0;0,200;1,200;1,202;10,202;10,220;110,220;110,212;111,212;111,12;101,12;101,2;100,2;100,0) props={'id'=>#42}");
|
||||
++s;
|
||||
|
||||
EXPECT_EQ (s.at_end (), true);
|
||||
|
|
@ -2395,7 +2395,7 @@ TEST(53_PropertiesDeepFromLayout)
|
|||
EXPECT_EQ (s.at_end (), false);
|
||||
|
||||
// polygons are merged with "maximum" property value
|
||||
EXPECT_EQ (db::PolygonWithProperties (*s, s.prop_id ()).to_string (), "(0,0;0,200;1,200;1,202;10,202;10,220;110,220;110,212;111,212;111,12;101,12;101,2;100,2;100,0) props={VALUE=>42}");
|
||||
EXPECT_EQ (db::PolygonWithProperties (*s, s.prop_id ()).to_string (), "(0,0;0,200;1,200;1,202;10,202;10,220;110,220;110,212;111,212;111,12;101,12;101,2;100,2;100,0) props={'VALUE'=>#42}");
|
||||
++s;
|
||||
|
||||
EXPECT_EQ (s.at_end (), true);
|
||||
|
|
|
|||
|
|
@ -147,160 +147,160 @@ class DBEdgeNeighborhoodWithNets(unittest.TestCase):
|
|||
|
||||
self.maxDiff = None
|
||||
self.assertEqual("\n" + visitor.dump(), """
|
||||
Polygon: (-14000,0;-14000,15000;-11000,15000;-11000,0) props={net=>net1}
|
||||
Edge: (-11000,0;-14000,0) props={net=>net1}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={net=>net1}
|
||||
Edge: (-11000,15000;-11000,0) props={net=>net1}
|
||||
0.0,500.0 -> 0: (0,-11;0,0;500,0;500,-11) props={net=>net1}
|
||||
0.0,500.0 -> 1: (0,1500;0,6001;500,6001;500,1500) props={net=>net1}
|
||||
0.0,500.0 -> 3: (0,-11;0,4500;500,4500;500,-11) props={net=>net1}
|
||||
500.0,2500.0 -> 0: (500,-11;500,0;2500,0;2500,-11) props={net=>net1}
|
||||
500.0,2500.0 -> 1: (500,1500;500,6001;2500,6001;2500,1500) props={net=>net1}
|
||||
500.0,2500.0 -> 2: (500,2000;500,4000;2500,4000;2500,2000) props={net=>net1}
|
||||
500.0,2500.0 -> 3: (500,-11;500,4500;2500,4500;2500,-11) props={net=>net1}
|
||||
2500.0,3000.0 -> 0: (2500,-11;2500,0;3000,0;3000,-11) props={net=>net1}
|
||||
2500.0,3000.0 -> 1: (2500,1500;2500,6001;3000,6001;3000,1500) props={net=>net1}
|
||||
2500.0,3000.0 -> 3: (2500,-11;2500,4500;3000,4500;3000,-11) props={net=>net1}
|
||||
3000.0,8500.0 -> 0: (3000,-11;3000,0;8500,0;8500,-11) props={net=>net1}
|
||||
3000.0,8500.0 -> 1: (3000,1500;3000,4500;8500,4500;8500,1500) props={net=>net1}/(3000,6000;3000,6001;8500,6001;8500,6000) props={net=>net1}
|
||||
3000.0,8500.0 -> 3: (3000,-11;3000,0;8500,0;8500,-11) props={net=>net1}
|
||||
8500.0,15000.0 -> 0: (8500,-11;8500,0;15000,0;15000,-11) props={net=>net1}
|
||||
8500.0,15000.0 -> 1: (8500,1500;8500,4500;15000,4500;15000,1500) props={net=>net1}/(8500,6000;8500,6001;15000,6001;15000,6000) props={net=>net1}
|
||||
Edge: (-14000,0;-14000,15000) props={net=>net1}
|
||||
0.0,6500.0 -> 0: (0,-11;0,0;6500,0;6500,-11) props={net=>net1}
|
||||
6500.0,15000.0 -> 0: (6500,-11;6500,0;15000,0;15000,-11) props={net=>net1}
|
||||
6500.0,15000.0 -> 3: (6500,-11;6500,0;15000,0;15000,-11) props={net=>net1}
|
||||
Edge: (-14000,15000;-11000,15000) props={net=>net1}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={net=>net1}
|
||||
0.0,3000.0 -> 1: (0,1500;0,5000;3000,5000;3000,1500) props={net=>net3}
|
||||
0.0,3000.0 -> 3: (0,-11;0,0;3000,0;3000,-11) props={net=>net1}
|
||||
3000.0,3001.0 -> 1: (3000,1500;3000,5000;3001,5000;3001,1500) props={net=>net3}
|
||||
3000.0,3001.0 -> 3: (3000,-11;3000,0;3001,0;3001,-11) props={net=>net1}
|
||||
Polygon: (-14000,16500;-14000,20000;0,20000;0,16500) props={net=>net3}
|
||||
Edge: (-14000,16500;-14000,20000) props={net=>net3}
|
||||
0.0,3500.0 -> 0: (0,-11;0,0;3500,0;3500,-11) props={net=>net3}
|
||||
Edge: (-14000,20000;0,20000) props={net=>net3}
|
||||
0.0,7000.0 -> 0: (0,-11;0,0;7000,0;7000,-11) props={net=>net3}
|
||||
7000.0,14000.0 -> 0: (7000,-11;7000,0;14000,0;14000,-11) props={net=>net3}
|
||||
7000.0,14000.0 -> 3: (7000,-11;7000,0;14000,0;14000,-11) props={net=>net2}
|
||||
14000.0,14001.0 -> 3: (14000,-11;14000,0;14001,0;14001,-11) props={net=>net2}
|
||||
Edge: (0,16500;-14000,16500) props={net=>net3}
|
||||
-1.0,0.0 -> 3: (-1,-11;-1,0;0,0;0,-11) props={net=>net2}
|
||||
0.0,5000.0 -> 0: (0,-11;0,0;5000,0;5000,-11) props={net=>net3}
|
||||
0.0,5000.0 -> 1: (0,1500;0,6001;5000,6001;5000,1500) props={net=>net1}
|
||||
0.0,5000.0 -> 3: (0,-11;0,0;5000,0;5000,-11) props={net=>net2}
|
||||
5000.0,6500.0 -> 0: (5000,-11;5000,0;6500,0;6500,-11) props={net=>net3}
|
||||
5000.0,6500.0 -> 1: (5000,1500;5000,4500;6500,4500;6500,1500) props={net=>net1}
|
||||
5000.0,6500.0 -> 3: (5000,-11;5000,0;6500,0;6500,-11) props={net=>net2}
|
||||
6500.0,7000.0 -> 0: (6500,-11;6500,0;7000,0;7000,-11) props={net=>net3}
|
||||
6500.0,7000.0 -> 1: (6500,1500;6500,6001;7000,6001;7000,1500) props={net=>net1}
|
||||
6500.0,7000.0 -> 3: (6500,-11;6500,0;7000,0;7000,-11) props={net=>net2}/(6500,1500;6500,4500;7000,4500;7000,1500) props={net=>net1}
|
||||
7000.0,9000.0 -> 0: (7000,-11;7000,0;9000,0;9000,-11) props={net=>net3}
|
||||
7000.0,9000.0 -> 1: (7000,1500;7000,6001;9000,6001;9000,1500) props={net=>net1}
|
||||
7000.0,9000.0 -> 2: (7000,2000;7000,4000;9000,4000;9000,2000) props={net=>net1}
|
||||
7000.0,9000.0 -> 3: (7000,1500;7000,4500;9000,4500;9000,1500) props={net=>net1}
|
||||
9000.0,9500.0 -> 0: (9000,-11;9000,0;9500,0;9500,-11) props={net=>net3}
|
||||
9000.0,9500.0 -> 1: (9000,1500;9000,6001;9500,6001;9500,1500) props={net=>net1}
|
||||
9000.0,9500.0 -> 3: (9000,1500;9000,4500;9500,4500;9500,1500) props={net=>net1}
|
||||
9500.0,11000.0 -> 0: (9500,-11;9500,0;11000,0;11000,-11) props={net=>net3}
|
||||
9500.0,11000.0 -> 3: (9500,1500;9500,4500;11000,4500;11000,1500) props={net=>net1}
|
||||
11000.0,11500.0 -> 0: (11000,-11;11000,0;11500,0;11500,-11) props={net=>net3}
|
||||
11000.0,11500.0 -> 1: (11000,1500;11000,6001;11500,6001;11500,1500) props={net=>net1}
|
||||
11000.0,11500.0 -> 3: (11000,1500;11000,6001;11500,6001;11500,1500) props={net=>net1}
|
||||
11500.0,13500.0 -> 0: (11500,-11;11500,0;13500,0;13500,-11) props={net=>net3}
|
||||
11500.0,13500.0 -> 1: (11500,1500;11500,6001;13500,6001;13500,1500) props={net=>net1}
|
||||
11500.0,13500.0 -> 2: (11500,2000;11500,4000;13500,4000;13500,2000) props={net=>net1}
|
||||
11500.0,13500.0 -> 3: (11500,1500;11500,6001;13500,6001;13500,1500) props={net=>net1}
|
||||
13500.0,14000.0 -> 0: (13500,-11;13500,0;14000,0;14000,-11) props={net=>net3}
|
||||
13500.0,14000.0 -> 1: (13500,1500;13500,6001;14000,6001;14000,1500) props={net=>net1}
|
||||
13500.0,14000.0 -> 3: (13500,1500;13500,6001;14000,6001;14000,1500) props={net=>net1}
|
||||
Edge: (0,20000;0,16500) props={net=>net3}
|
||||
0.0,3500.0 -> 0: (0,-11;0,0;3500,0;3500,-11) props={net=>net3}
|
||||
0.0,3500.0 -> 3: (0,-11;0,4500;3500,4500;3500,-11) props={net=>net2}
|
||||
3500.0,3501.0 -> 3: (3500,1500;3500,4500;3501,4500;3501,1500) props={net=>net2}
|
||||
Polygon: (-9500,-5500;-9500,-1500;5000,-1500;5000,-5500) props={net=>net2}
|
||||
Edge: (-9500,-1500;5000,-1500) props={net=>net2}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={net=>net2}
|
||||
0.0,3000.0 -> 1: (0,1500;0,6001;3000,6001;3000,1500) props={net=>net1}
|
||||
3000.0,4500.0 -> 0: (3000,-11;3000,0;4500,0;4500,-11) props={net=>net2}
|
||||
4500.0,9500.0 -> 0: (4500,-11;4500,0;9500,0;9500,-11) props={net=>net2}
|
||||
4500.0,9500.0 -> 1: (4500,1500;4500,6001;9500,6001;9500,1500) props={net=>net1}
|
||||
9500.0,11000.0 -> 0: (9500,-11;9500,0;11000,0;11000,-11) props={net=>net2}
|
||||
11000.0,14000.0 -> 0: (11000,-11;11000,0;14000,0;14000,-11) props={net=>net2}
|
||||
11000.0,14000.0 -> 3: (11000,-11;11000,6001;14000,6001;14000,-11) props={net=>net2}
|
||||
14000.0,14500.0 -> 0: (14000,-11;14000,0;14500,0;14500,-11) props={net=>net2}
|
||||
Edge: (-9500,-5500;-9500,-1500) props={net=>net2}
|
||||
0.0,4000.0 -> 0: (0,-11;0,0;4000,0;4000,-11) props={net=>net2}
|
||||
Edge: (5000,-1500;5000,-5500) props={net=>net2}
|
||||
0.0,4000.0 -> 0: (0,-11;0,0;4000,0;4000,-11) props={net=>net2}
|
||||
Edge: (5000,-5500;-9500,-5500) props={net=>net2}
|
||||
0.0,14500.0 -> 0: (0,-11;0,0;14500,0;14500,-11) props={net=>net2}
|
||||
Polygon: (-9500,0;-9500,15000;0,15000;0,0;-5000,0;-5000,12000;-6500,12000;-6500,0) props={net=>net1}
|
||||
Edge: (-5000,0;-5000,12000) props={net=>net1}
|
||||
0.0,6500.0 -> 0: (0,-11;0,0;6500,0;6500,-11) props={net=>net1}/(0,1500;0,4500;6500,4500;6500,1500) props={net=>net1}
|
||||
0.0,6500.0 -> 1: (0,6000;0,6001;6500,6001;6500,6000) props={net=>net1}
|
||||
6500.0,12000.0 -> 0: (6500,-11;6500,0;12000,0;12000,-11) props={net=>net1}/(6500,1500;6500,4500;12000,4500;12000,1500) props={net=>net1}
|
||||
6500.0,12000.0 -> 1: (6500,6000;6500,6001;12000,6001;12000,6000) props={net=>net1}
|
||||
6500.0,12000.0 -> 3: (6500,6000;6500,6001;12000,6001;12000,6000) props={net=>net1}
|
||||
12000.0,12001.0 -> 0: (12000,-11;12000,4500;12001,4500;12001,-11) props={net=>net1}
|
||||
12000.0,12001.0 -> 1: (12000,6000;12000,6001;12001,6001;12001,6000) props={net=>net1}
|
||||
12000.0,12001.0 -> 3: (12000,1500;12000,6001;12001,6001;12001,1500) props={net=>net1}
|
||||
Edge: (-5000,12000;-6500,12000) props={net=>net1}
|
||||
-1.0,0.0 -> 0: (-1,-11;-1,6001;0,6001;0,-11) props={net=>net1}
|
||||
0.0,1500.0 -> 0: (0,-11;0,0;1500,0;1500,-11) props={net=>net1}
|
||||
1500.0,1501.0 -> 0: (1500,-11;1500,6001;1501,6001;1501,-11) props={net=>net1}
|
||||
1500.0,1501.0 -> 3: (1500,-11;1500,0;1501,0;1501,-11) props={net=>net1}
|
||||
Edge: (-6500,0;-9500,0) props={net=>net1}
|
||||
-1.0,0.0 -> 1: (-1,1500;-1,5500;0,5500;0,1500) props={net=>net2}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={net=>net1}
|
||||
0.0,3000.0 -> 1: (0,1500;0,5500;3000,5500;3000,1500) props={net=>net2}
|
||||
Edge: (-6500,12000;-6500,0) props={net=>net1}
|
||||
-1.0,0.0 -> 0: (-1,-11;-1,6001;0,6001;0,-11) props={net=>net1}
|
||||
-1.0,0.0 -> 3: (-1,-11;-1,0;0,0;0,-11) props={net=>net1}
|
||||
0.0,12000.0 -> 0: (0,-11;0,0;12000,0;12000,-11) props={net=>net1}/(0,1500;0,6001;12000,6001;12000,1500) props={net=>net1}
|
||||
Edge: (-9500,0;-9500,15000) props={net=>net1}
|
||||
0.0,6500.0 -> 0: (0,-11;0,0;6500,0;6500,-11) props={net=>net1}
|
||||
0.0,6500.0 -> 1: (0,1500;0,4500;6500,4500;6500,1500) props={net=>net1}
|
||||
6500.0,12000.0 -> 0: (6500,-11;6500,0;12000,0;12000,-11) props={net=>net1}
|
||||
6500.0,12000.0 -> 1: (6500,1500;6500,4500;12000,4500;12000,1500) props={net=>net1}
|
||||
6500.0,12000.0 -> 3: (6500,1500;6500,4500;12000,4500;12000,1500) props={net=>net1}
|
||||
12000.0,12500.0 -> 0: (12000,-11;12000,0;12500,0;12500,-11) props={net=>net1}
|
||||
12000.0,12500.0 -> 1: (12000,1500;12000,4500;12500,4500;12500,1500) props={net=>net1}
|
||||
12000.0,12500.0 -> 3: (12000,-11;12000,4500;12500,4500;12500,-11) props={net=>net1}
|
||||
12500.0,14500.0 -> 0: (12500,-11;12500,0;14500,0;14500,-11) props={net=>net1}
|
||||
12500.0,14500.0 -> 1: (12500,1500;12500,4500;14500,4500;14500,1500) props={net=>net1}
|
||||
12500.0,14500.0 -> 2: (12500,2000;12500,4000;14500,4000;14500,2000) props={net=>net1}
|
||||
12500.0,14500.0 -> 3: (12500,-11;12500,4500;14500,4500;14500,-11) props={net=>net1}
|
||||
14500.0,15000.0 -> 0: (14500,-11;14500,0;15000,0;15000,-11) props={net=>net1}
|
||||
14500.0,15000.0 -> 1: (14500,1500;14500,4500;15000,4500;15000,1500) props={net=>net1}
|
||||
14500.0,15000.0 -> 3: (14500,-11;14500,4500;15000,4500;15000,-11) props={net=>net1}
|
||||
Edge: (-9500,15000;0,15000) props={net=>net1}
|
||||
-1.0,0.0 -> 1: (-1,1500;-1,5000;0,5000;0,1500) props={net=>net3}
|
||||
-1.0,0.0 -> 3: (-1,-11;-1,0;0,0;0,-11) props={net=>net1}
|
||||
0.0,2500.0 -> 0: (0,-11;0,0;2500,0;2500,-11) props={net=>net1}
|
||||
0.0,2500.0 -> 1: (0,1500;0,5000;2500,5000;2500,1500) props={net=>net3}
|
||||
0.0,2500.0 -> 3: (0,-11;0,0;2500,0;2500,-11) props={net=>net1}
|
||||
2500.0,3000.0 -> 0: (2500,-11;2500,0;3000,0;3000,-11) props={net=>net1}
|
||||
2500.0,3000.0 -> 1: (2500,1500;2500,5000;3000,5000;3000,1500) props={net=>net3}
|
||||
2500.0,3000.0 -> 3: (2500,-11;2500,0;3000,0;3000,-11) props={net=>net1}/(2500,1500;2500,5000;3000,5000;3000,1500) props={net=>net2}
|
||||
3000.0,9500.0 -> 0: (3000,-11;3000,0;9500,0;9500,-11) props={net=>net1}
|
||||
3000.0,9500.0 -> 1: (3000,1500;3000,5000;9500,5000;9500,1500) props={net=>net3}
|
||||
3000.0,9500.0 -> 3: (3000,1500;3000,5000;9500,5000;9500,1500) props={net=>net2}
|
||||
9500.0,9501.0 -> 3: (9500,1500;9500,5000;9501,5000;9501,1500) props={net=>net2}
|
||||
Edge: (0,0;-5000,0) props={net=>net1}
|
||||
-1.0,0.0 -> 1: (-1,1500;-1,5500;0,5500;0,1500) props={net=>net2}
|
||||
-1.0,0.0 -> 3: (-1,2000;-1,5000;0,5000;0,2000) props={net=>net2}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={net=>net1}
|
||||
0.0,3000.0 -> 1: (0,1500;0,5500;3000,5500;3000,1500) props={net=>net2}
|
||||
0.0,3000.0 -> 3: (0,2000;0,5000;3000,5000;3000,2000) props={net=>net2}
|
||||
3000.0,5000.0 -> 0: (3000,-11;3000,0;5000,0;5000,-11) props={net=>net1}
|
||||
3000.0,5000.0 -> 1: (3000,1500;3000,5500;5000,5500;5000,1500) props={net=>net2}
|
||||
5000.0,5001.0 -> 1: (5000,1500;5000,5500;5001,5500;5001,1500) props={net=>net2}
|
||||
Edge: (0,15000;0,0) props={net=>net1}
|
||||
-1.0,0.0 -> 3: (-1,1500;-1,4500;0,4500;0,1500) props={net=>net2}
|
||||
0.0,15000.0 -> 0: (0,-11;0,0;15000,0;15000,-11) props={net=>net1}
|
||||
0.0,15000.0 -> 3: (0,1500;0,4500;15000,4500;15000,1500) props={net=>net2}
|
||||
15000.0,15001.0 -> 3: (15000,1500;15000,4500;15001,4500;15001,1500) props={net=>net2}
|
||||
Polygon: (-14000,0;-14000,15000;-11000,15000;-11000,0) props={'net'=>'net1'}
|
||||
Edge: (-11000,0;-14000,0) props={'net'=>'net1'}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={'net'=>'net1'}
|
||||
Edge: (-11000,15000;-11000,0) props={'net'=>'net1'}
|
||||
0.0,500.0 -> 0: (0,-11;0,0;500,0;500,-11) props={'net'=>'net1'}
|
||||
0.0,500.0 -> 1: (0,1500;0,6001;500,6001;500,1500) props={'net'=>'net1'}
|
||||
0.0,500.0 -> 3: (0,-11;0,4500;500,4500;500,-11) props={'net'=>'net1'}
|
||||
500.0,2500.0 -> 0: (500,-11;500,0;2500,0;2500,-11) props={'net'=>'net1'}
|
||||
500.0,2500.0 -> 1: (500,1500;500,6001;2500,6001;2500,1500) props={'net'=>'net1'}
|
||||
500.0,2500.0 -> 2: (500,2000;500,4000;2500,4000;2500,2000) props={'net'=>'net1'}
|
||||
500.0,2500.0 -> 3: (500,-11;500,4500;2500,4500;2500,-11) props={'net'=>'net1'}
|
||||
2500.0,3000.0 -> 0: (2500,-11;2500,0;3000,0;3000,-11) props={'net'=>'net1'}
|
||||
2500.0,3000.0 -> 1: (2500,1500;2500,6001;3000,6001;3000,1500) props={'net'=>'net1'}
|
||||
2500.0,3000.0 -> 3: (2500,-11;2500,4500;3000,4500;3000,-11) props={'net'=>'net1'}
|
||||
3000.0,8500.0 -> 0: (3000,-11;3000,0;8500,0;8500,-11) props={'net'=>'net1'}
|
||||
3000.0,8500.0 -> 1: (3000,1500;3000,4500;8500,4500;8500,1500) props={'net'=>'net1'}/(3000,6000;3000,6001;8500,6001;8500,6000) props={'net'=>'net1'}
|
||||
3000.0,8500.0 -> 3: (3000,-11;3000,0;8500,0;8500,-11) props={'net'=>'net1'}
|
||||
8500.0,15000.0 -> 0: (8500,-11;8500,0;15000,0;15000,-11) props={'net'=>'net1'}
|
||||
8500.0,15000.0 -> 1: (8500,1500;8500,4500;15000,4500;15000,1500) props={'net'=>'net1'}/(8500,6000;8500,6001;15000,6001;15000,6000) props={'net'=>'net1'}
|
||||
Edge: (-14000,0;-14000,15000) props={'net'=>'net1'}
|
||||
0.0,6500.0 -> 0: (0,-11;0,0;6500,0;6500,-11) props={'net'=>'net1'}
|
||||
6500.0,15000.0 -> 0: (6500,-11;6500,0;15000,0;15000,-11) props={'net'=>'net1'}
|
||||
6500.0,15000.0 -> 3: (6500,-11;6500,0;15000,0;15000,-11) props={'net'=>'net1'}
|
||||
Edge: (-14000,15000;-11000,15000) props={'net'=>'net1'}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={'net'=>'net1'}
|
||||
0.0,3000.0 -> 1: (0,1500;0,5000;3000,5000;3000,1500) props={'net'=>'net3'}
|
||||
0.0,3000.0 -> 3: (0,-11;0,0;3000,0;3000,-11) props={'net'=>'net1'}
|
||||
3000.0,3001.0 -> 1: (3000,1500;3000,5000;3001,5000;3001,1500) props={'net'=>'net3'}
|
||||
3000.0,3001.0 -> 3: (3000,-11;3000,0;3001,0;3001,-11) props={'net'=>'net1'}
|
||||
Polygon: (-14000,16500;-14000,20000;0,20000;0,16500) props={'net'=>'net3'}
|
||||
Edge: (-14000,16500;-14000,20000) props={'net'=>'net3'}
|
||||
0.0,3500.0 -> 0: (0,-11;0,0;3500,0;3500,-11) props={'net'=>'net3'}
|
||||
Edge: (-14000,20000;0,20000) props={'net'=>'net3'}
|
||||
0.0,7000.0 -> 0: (0,-11;0,0;7000,0;7000,-11) props={'net'=>'net3'}
|
||||
7000.0,14000.0 -> 0: (7000,-11;7000,0;14000,0;14000,-11) props={'net'=>'net3'}
|
||||
7000.0,14000.0 -> 3: (7000,-11;7000,0;14000,0;14000,-11) props={'net'=>'net2'}
|
||||
14000.0,14001.0 -> 3: (14000,-11;14000,0;14001,0;14001,-11) props={'net'=>'net2'}
|
||||
Edge: (0,16500;-14000,16500) props={'net'=>'net3'}
|
||||
-1.0,0.0 -> 3: (-1,-11;-1,0;0,0;0,-11) props={'net'=>'net2'}
|
||||
0.0,5000.0 -> 0: (0,-11;0,0;5000,0;5000,-11) props={'net'=>'net3'}
|
||||
0.0,5000.0 -> 1: (0,1500;0,6001;5000,6001;5000,1500) props={'net'=>'net1'}
|
||||
0.0,5000.0 -> 3: (0,-11;0,0;5000,0;5000,-11) props={'net'=>'net2'}
|
||||
5000.0,6500.0 -> 0: (5000,-11;5000,0;6500,0;6500,-11) props={'net'=>'net3'}
|
||||
5000.0,6500.0 -> 1: (5000,1500;5000,4500;6500,4500;6500,1500) props={'net'=>'net1'}
|
||||
5000.0,6500.0 -> 3: (5000,-11;5000,0;6500,0;6500,-11) props={'net'=>'net2'}
|
||||
6500.0,7000.0 -> 0: (6500,-11;6500,0;7000,0;7000,-11) props={'net'=>'net3'}
|
||||
6500.0,7000.0 -> 1: (6500,1500;6500,6001;7000,6001;7000,1500) props={'net'=>'net1'}
|
||||
6500.0,7000.0 -> 3: (6500,-11;6500,0;7000,0;7000,-11) props={'net'=>'net2'}/(6500,1500;6500,4500;7000,4500;7000,1500) props={'net'=>'net1'}
|
||||
7000.0,9000.0 -> 0: (7000,-11;7000,0;9000,0;9000,-11) props={'net'=>'net3'}
|
||||
7000.0,9000.0 -> 1: (7000,1500;7000,6001;9000,6001;9000,1500) props={'net'=>'net1'}
|
||||
7000.0,9000.0 -> 2: (7000,2000;7000,4000;9000,4000;9000,2000) props={'net'=>'net1'}
|
||||
7000.0,9000.0 -> 3: (7000,1500;7000,4500;9000,4500;9000,1500) props={'net'=>'net1'}
|
||||
9000.0,9500.0 -> 0: (9000,-11;9000,0;9500,0;9500,-11) props={'net'=>'net3'}
|
||||
9000.0,9500.0 -> 1: (9000,1500;9000,6001;9500,6001;9500,1500) props={'net'=>'net1'}
|
||||
9000.0,9500.0 -> 3: (9000,1500;9000,4500;9500,4500;9500,1500) props={'net'=>'net1'}
|
||||
9500.0,11000.0 -> 0: (9500,-11;9500,0;11000,0;11000,-11) props={'net'=>'net3'}
|
||||
9500.0,11000.0 -> 3: (9500,1500;9500,4500;11000,4500;11000,1500) props={'net'=>'net1'}
|
||||
11000.0,11500.0 -> 0: (11000,-11;11000,0;11500,0;11500,-11) props={'net'=>'net3'}
|
||||
11000.0,11500.0 -> 1: (11000,1500;11000,6001;11500,6001;11500,1500) props={'net'=>'net1'}
|
||||
11000.0,11500.0 -> 3: (11000,1500;11000,6001;11500,6001;11500,1500) props={'net'=>'net1'}
|
||||
11500.0,13500.0 -> 0: (11500,-11;11500,0;13500,0;13500,-11) props={'net'=>'net3'}
|
||||
11500.0,13500.0 -> 1: (11500,1500;11500,6001;13500,6001;13500,1500) props={'net'=>'net1'}
|
||||
11500.0,13500.0 -> 2: (11500,2000;11500,4000;13500,4000;13500,2000) props={'net'=>'net1'}
|
||||
11500.0,13500.0 -> 3: (11500,1500;11500,6001;13500,6001;13500,1500) props={'net'=>'net1'}
|
||||
13500.0,14000.0 -> 0: (13500,-11;13500,0;14000,0;14000,-11) props={'net'=>'net3'}
|
||||
13500.0,14000.0 -> 1: (13500,1500;13500,6001;14000,6001;14000,1500) props={'net'=>'net1'}
|
||||
13500.0,14000.0 -> 3: (13500,1500;13500,6001;14000,6001;14000,1500) props={'net'=>'net1'}
|
||||
Edge: (0,20000;0,16500) props={'net'=>'net3'}
|
||||
0.0,3500.0 -> 0: (0,-11;0,0;3500,0;3500,-11) props={'net'=>'net3'}
|
||||
0.0,3500.0 -> 3: (0,-11;0,4500;3500,4500;3500,-11) props={'net'=>'net2'}
|
||||
3500.0,3501.0 -> 3: (3500,1500;3500,4500;3501,4500;3501,1500) props={'net'=>'net2'}
|
||||
Polygon: (-9500,-5500;-9500,-1500;5000,-1500;5000,-5500) props={'net'=>'net2'}
|
||||
Edge: (-9500,-1500;5000,-1500) props={'net'=>'net2'}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={'net'=>'net2'}
|
||||
0.0,3000.0 -> 1: (0,1500;0,6001;3000,6001;3000,1500) props={'net'=>'net1'}
|
||||
3000.0,4500.0 -> 0: (3000,-11;3000,0;4500,0;4500,-11) props={'net'=>'net2'}
|
||||
4500.0,9500.0 -> 0: (4500,-11;4500,0;9500,0;9500,-11) props={'net'=>'net2'}
|
||||
4500.0,9500.0 -> 1: (4500,1500;4500,6001;9500,6001;9500,1500) props={'net'=>'net1'}
|
||||
9500.0,11000.0 -> 0: (9500,-11;9500,0;11000,0;11000,-11) props={'net'=>'net2'}
|
||||
11000.0,14000.0 -> 0: (11000,-11;11000,0;14000,0;14000,-11) props={'net'=>'net2'}
|
||||
11000.0,14000.0 -> 3: (11000,-11;11000,6001;14000,6001;14000,-11) props={'net'=>'net2'}
|
||||
14000.0,14500.0 -> 0: (14000,-11;14000,0;14500,0;14500,-11) props={'net'=>'net2'}
|
||||
Edge: (-9500,-5500;-9500,-1500) props={'net'=>'net2'}
|
||||
0.0,4000.0 -> 0: (0,-11;0,0;4000,0;4000,-11) props={'net'=>'net2'}
|
||||
Edge: (5000,-1500;5000,-5500) props={'net'=>'net2'}
|
||||
0.0,4000.0 -> 0: (0,-11;0,0;4000,0;4000,-11) props={'net'=>'net2'}
|
||||
Edge: (5000,-5500;-9500,-5500) props={'net'=>'net2'}
|
||||
0.0,14500.0 -> 0: (0,-11;0,0;14500,0;14500,-11) props={'net'=>'net2'}
|
||||
Polygon: (-9500,0;-9500,15000;0,15000;0,0;-5000,0;-5000,12000;-6500,12000;-6500,0) props={'net'=>'net1'}
|
||||
Edge: (-5000,0;-5000,12000) props={'net'=>'net1'}
|
||||
0.0,6500.0 -> 0: (0,-11;0,0;6500,0;6500,-11) props={'net'=>'net1'}/(0,1500;0,4500;6500,4500;6500,1500) props={'net'=>'net1'}
|
||||
0.0,6500.0 -> 1: (0,6000;0,6001;6500,6001;6500,6000) props={'net'=>'net1'}
|
||||
6500.0,12000.0 -> 0: (6500,-11;6500,0;12000,0;12000,-11) props={'net'=>'net1'}/(6500,1500;6500,4500;12000,4500;12000,1500) props={'net'=>'net1'}
|
||||
6500.0,12000.0 -> 1: (6500,6000;6500,6001;12000,6001;12000,6000) props={'net'=>'net1'}
|
||||
6500.0,12000.0 -> 3: (6500,6000;6500,6001;12000,6001;12000,6000) props={'net'=>'net1'}
|
||||
12000.0,12001.0 -> 0: (12000,-11;12000,4500;12001,4500;12001,-11) props={'net'=>'net1'}
|
||||
12000.0,12001.0 -> 1: (12000,6000;12000,6001;12001,6001;12001,6000) props={'net'=>'net1'}
|
||||
12000.0,12001.0 -> 3: (12000,1500;12000,6001;12001,6001;12001,1500) props={'net'=>'net1'}
|
||||
Edge: (-5000,12000;-6500,12000) props={'net'=>'net1'}
|
||||
-1.0,0.0 -> 0: (-1,-11;-1,6001;0,6001;0,-11) props={'net'=>'net1'}
|
||||
0.0,1500.0 -> 0: (0,-11;0,0;1500,0;1500,-11) props={'net'=>'net1'}
|
||||
1500.0,1501.0 -> 0: (1500,-11;1500,6001;1501,6001;1501,-11) props={'net'=>'net1'}
|
||||
1500.0,1501.0 -> 3: (1500,-11;1500,0;1501,0;1501,-11) props={'net'=>'net1'}
|
||||
Edge: (-6500,0;-9500,0) props={'net'=>'net1'}
|
||||
-1.0,0.0 -> 1: (-1,1500;-1,5500;0,5500;0,1500) props={'net'=>'net2'}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={'net'=>'net1'}
|
||||
0.0,3000.0 -> 1: (0,1500;0,5500;3000,5500;3000,1500) props={'net'=>'net2'}
|
||||
Edge: (-6500,12000;-6500,0) props={'net'=>'net1'}
|
||||
-1.0,0.0 -> 0: (-1,-11;-1,6001;0,6001;0,-11) props={'net'=>'net1'}
|
||||
-1.0,0.0 -> 3: (-1,-11;-1,0;0,0;0,-11) props={'net'=>'net1'}
|
||||
0.0,12000.0 -> 0: (0,-11;0,0;12000,0;12000,-11) props={'net'=>'net1'}/(0,1500;0,6001;12000,6001;12000,1500) props={'net'=>'net1'}
|
||||
Edge: (-9500,0;-9500,15000) props={'net'=>'net1'}
|
||||
0.0,6500.0 -> 0: (0,-11;0,0;6500,0;6500,-11) props={'net'=>'net1'}
|
||||
0.0,6500.0 -> 1: (0,1500;0,4500;6500,4500;6500,1500) props={'net'=>'net1'}
|
||||
6500.0,12000.0 -> 0: (6500,-11;6500,0;12000,0;12000,-11) props={'net'=>'net1'}
|
||||
6500.0,12000.0 -> 1: (6500,1500;6500,4500;12000,4500;12000,1500) props={'net'=>'net1'}
|
||||
6500.0,12000.0 -> 3: (6500,1500;6500,4500;12000,4500;12000,1500) props={'net'=>'net1'}
|
||||
12000.0,12500.0 -> 0: (12000,-11;12000,0;12500,0;12500,-11) props={'net'=>'net1'}
|
||||
12000.0,12500.0 -> 1: (12000,1500;12000,4500;12500,4500;12500,1500) props={'net'=>'net1'}
|
||||
12000.0,12500.0 -> 3: (12000,-11;12000,4500;12500,4500;12500,-11) props={'net'=>'net1'}
|
||||
12500.0,14500.0 -> 0: (12500,-11;12500,0;14500,0;14500,-11) props={'net'=>'net1'}
|
||||
12500.0,14500.0 -> 1: (12500,1500;12500,4500;14500,4500;14500,1500) props={'net'=>'net1'}
|
||||
12500.0,14500.0 -> 2: (12500,2000;12500,4000;14500,4000;14500,2000) props={'net'=>'net1'}
|
||||
12500.0,14500.0 -> 3: (12500,-11;12500,4500;14500,4500;14500,-11) props={'net'=>'net1'}
|
||||
14500.0,15000.0 -> 0: (14500,-11;14500,0;15000,0;15000,-11) props={'net'=>'net1'}
|
||||
14500.0,15000.0 -> 1: (14500,1500;14500,4500;15000,4500;15000,1500) props={'net'=>'net1'}
|
||||
14500.0,15000.0 -> 3: (14500,-11;14500,4500;15000,4500;15000,-11) props={'net'=>'net1'}
|
||||
Edge: (-9500,15000;0,15000) props={'net'=>'net1'}
|
||||
-1.0,0.0 -> 1: (-1,1500;-1,5000;0,5000;0,1500) props={'net'=>'net3'}
|
||||
-1.0,0.0 -> 3: (-1,-11;-1,0;0,0;0,-11) props={'net'=>'net1'}
|
||||
0.0,2500.0 -> 0: (0,-11;0,0;2500,0;2500,-11) props={'net'=>'net1'}
|
||||
0.0,2500.0 -> 1: (0,1500;0,5000;2500,5000;2500,1500) props={'net'=>'net3'}
|
||||
0.0,2500.0 -> 3: (0,-11;0,0;2500,0;2500,-11) props={'net'=>'net1'}
|
||||
2500.0,3000.0 -> 0: (2500,-11;2500,0;3000,0;3000,-11) props={'net'=>'net1'}
|
||||
2500.0,3000.0 -> 1: (2500,1500;2500,5000;3000,5000;3000,1500) props={'net'=>'net3'}
|
||||
2500.0,3000.0 -> 3: (2500,-11;2500,0;3000,0;3000,-11) props={'net'=>'net1'}/(2500,1500;2500,5000;3000,5000;3000,1500) props={'net'=>'net2'}
|
||||
3000.0,9500.0 -> 0: (3000,-11;3000,0;9500,0;9500,-11) props={'net'=>'net1'}
|
||||
3000.0,9500.0 -> 1: (3000,1500;3000,5000;9500,5000;9500,1500) props={'net'=>'net3'}
|
||||
3000.0,9500.0 -> 3: (3000,1500;3000,5000;9500,5000;9500,1500) props={'net'=>'net2'}
|
||||
9500.0,9501.0 -> 3: (9500,1500;9500,5000;9501,5000;9501,1500) props={'net'=>'net2'}
|
||||
Edge: (0,0;-5000,0) props={'net'=>'net1'}
|
||||
-1.0,0.0 -> 1: (-1,1500;-1,5500;0,5500;0,1500) props={'net'=>'net2'}
|
||||
-1.0,0.0 -> 3: (-1,2000;-1,5000;0,5000;0,2000) props={'net'=>'net2'}
|
||||
0.0,3000.0 -> 0: (0,-11;0,0;3000,0;3000,-11) props={'net'=>'net1'}
|
||||
0.0,3000.0 -> 1: (0,1500;0,5500;3000,5500;3000,1500) props={'net'=>'net2'}
|
||||
0.0,3000.0 -> 3: (0,2000;0,5000;3000,5000;3000,2000) props={'net'=>'net2'}
|
||||
3000.0,5000.0 -> 0: (3000,-11;3000,0;5000,0;5000,-11) props={'net'=>'net1'}
|
||||
3000.0,5000.0 -> 1: (3000,1500;3000,5500;5000,5500;5000,1500) props={'net'=>'net2'}
|
||||
5000.0,5001.0 -> 1: (5000,1500;5000,5500;5001,5500;5001,1500) props={'net'=>'net2'}
|
||||
Edge: (0,15000;0,0) props={'net'=>'net1'}
|
||||
-1.0,0.0 -> 3: (-1,1500;-1,4500;0,4500;0,1500) props={'net'=>'net2'}
|
||||
0.0,15000.0 -> 0: (0,-11;0,0;15000,0;15000,-11) props={'net'=>'net1'}
|
||||
0.0,15000.0 -> 3: (0,1500;0,4500;15000,4500;15000,1500) props={'net'=>'net2'}
|
||||
15000.0,15001.0 -> 3: (15000,1500;15000,4500;15001,4500;15001,1500) props={'net'=>'net2'}
|
||||
""")
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -520,16 +520,16 @@ class DBBox_TestClass < TestBase
|
|||
assert_equal(s.to_s, "() props={}")
|
||||
|
||||
s = RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), pid)
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>one}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0.1,0.2) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'one'}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0.1,0.2) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
@ -538,34 +538,40 @@ class DBBox_TestClass < TestBase
|
|||
assert_equal(s.to_s, "() props={}")
|
||||
|
||||
s = RBA::DBoxWithProperties::new(RBA::DBox::new(0, 0, 100, 200), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::DBoxWithProperties::new(RBA::DBox::new(0, 0, 100, 200), pid)
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>one}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;250,500) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'one'}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;250,500) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
||||
# binary serialization
|
||||
|
||||
s = RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), {})
|
||||
assert_equal(RBA::BoxWithProperties::from_bytes(s.to_bytes).to_s, s.to_s)
|
||||
|
||||
s = RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), { 1 => "one", "key" => 17 })
|
||||
assert_equal(RBA::BoxWithProperties::from_bytes(s.to_bytes).to_s, s.to_s)
|
||||
|
||||
s = RBA::DBoxWithProperties::new(RBA::DBox::new(0, 0, 100, 200), {})
|
||||
assert_equal(RBA::DBoxWithProperties::from_bytes(s.to_bytes).to_s, s.to_s)
|
||||
|
||||
s = RBA::DBoxWithProperties::new(RBA::DBox::new(0, 0, 100, 200), { 1 => "one", "key" => 17 })
|
||||
assert_equal(RBA::DBoxWithProperties::from_bytes(s.to_bytes).to_s, s.to_s)
|
||||
|
||||
# string serialization
|
||||
s = RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), {})
|
||||
assert_equal(RBA::BoxWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), { 1 => "one", "key" => 17 })
|
||||
assert_equal(RBA::BoxWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::DBoxWithProperties::new(RBA::DBox::new(0, 0, 100, 200), {})
|
||||
assert_equal(RBA::DBoxWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::DBoxWithProperties::new(RBA::DBox::new(0, 0, 100, 200), { 1 => "one", "key" => 17 })
|
||||
assert_equal(RBA::DBoxWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -123,15 +123,15 @@ class DBEdgeNeighborhood_TestClass < TestBase
|
|||
"edge = (-1100,0;-1100,1000) props={}\n" +
|
||||
"edge = (-1100,1000;-100,1000) props={}\n" +
|
||||
"edge = (-100,1000;-100,0) props={}\n" +
|
||||
" 0.0,1000.0 -> 0: (0,100;0,101;1000,101;1000,100) props={1=>one}\n" +
|
||||
" 0.0,1000.0 -> 0: (0,100;0,101;1000,101;1000,100) props={#1=>'one'}\n" +
|
||||
"edge = (-100,0;-1100,0) props={}\n" +
|
||||
"/Polygon\n" +
|
||||
"Polygon: (0,0;0,1000;1000,1000;1000,0) props={1=>one}\n" +
|
||||
"edge = (0,0;0,1000) props={1=>one}\n" +
|
||||
"Polygon: (0,0;0,1000;1000,1000;1000,0) props={#1=>'one'}\n" +
|
||||
"edge = (0,0;0,1000) props={#1=>'one'}\n" +
|
||||
" 0.0,1000.0 -> 0: (0,100;0,101;1000,101;1000,100) props={}\n" +
|
||||
"edge = (0,1000;1000,1000) props={1=>one}\n" +
|
||||
"edge = (1000,1000;1000,0) props={1=>one}\n" +
|
||||
"edge = (1000,0;0,0) props={1=>one}\n" +
|
||||
"edge = (0,1000;1000,1000) props={#1=>'one'}\n" +
|
||||
"edge = (1000,1000;1000,0) props={#1=>'one'}\n" +
|
||||
"edge = (1000,0;0,0) props={#1=>'one'}\n" +
|
||||
"/Polygon\n"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -258,16 +258,16 @@ class DBEdgePair_TestClass < TestBase
|
|||
assert_equal(s.to_s, "(0,0;0,0)/(0,0;0,0) props={}")
|
||||
|
||||
s = RBA::EdgePairWithProperties::new(RBA::EdgePair::new(RBA::Edge::new(0, 0, 100, 200), RBA::Edge::new(10, 10, 110, 210)), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::EdgePairWithProperties::new(RBA::EdgePair::new(RBA::Edge::new(0, 0, 100, 200), RBA::Edge::new(10, 10, 110, 210)), pid)
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={1=>one}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0.1,0.2)/(0.01,0.01;0.11,0.21) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={#1=>'one'}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0.1,0.2)/(0.01,0.01;0.11,0.21) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
@ -276,16 +276,16 @@ class DBEdgePair_TestClass < TestBase
|
|||
assert_equal(s.to_s, "(0,0;0,0)/(0,0;0,0) props={}")
|
||||
|
||||
s = RBA::DEdgePairWithProperties::new(RBA::DEdgePair::new(RBA::DEdge::new(0, 0, 100, 200), RBA::DEdge::new(10, 10, 110, 210)), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::DEdgePairWithProperties::new(RBA::DEdgePair::new(RBA::DEdge::new(0, 0, 100, 200), RBA::DEdge::new(10, 10, 110, 210)), pid)
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={1=>one}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;250,500)/(25,25;275,525) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={#1=>'one'}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;250,500)/(25,25;275,525) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;100,200)/(10,10;110,210) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
|
|||
|
|
@ -622,7 +622,7 @@ class DBEdgePairs_TestClass < TestBase
|
|||
|
||||
r = RBA::EdgePairs::new([ RBA::EdgePairWithProperties::new(RBA::EdgePair::new(RBA::Edge::new(0, 0, 100, 100), RBA::Edge::new(200, 300, 200, 500)), { 1 => "one" }) ])
|
||||
assert_equal(r.to_s, "(0,0;100,100)/(200,300;200,500){1=>one}")
|
||||
assert_equal(r[0].to_s, "(0,0;100,100)/(200,300;200,500) props={1=>one}")
|
||||
assert_equal(r[0].to_s, "(0,0;100,100)/(200,300;200,500) props={#1=>'one'}")
|
||||
|
||||
r = RBA::EdgePairs::new([])
|
||||
assert_equal(r.to_s, "")
|
||||
|
|
@ -638,7 +638,7 @@ class DBEdgePairs_TestClass < TestBase
|
|||
r.insert(RBA::EdgePairWithProperties::new(RBA::EdgePair::new(RBA::Edge::new(0, 0, 100, 100), RBA::Edge::new(200, 300, 200, 500)), { 1 => "one" }))
|
||||
r.insert(RBA::EdgePair::new(RBA::Edge::new(0, 10, 100, 110), RBA::Edge::new(220, 300, 220, 500)))
|
||||
s = r.each.collect(&:to_s).join(";")
|
||||
assert_equal(s, "(0,10;100,110)/(220,300;220,500) props={};(0,0;100,100)/(200,300;200,500) props={1=>one}")
|
||||
assert_equal(s, "(0,10;100,110)/(220,300;220,500) props={};(0,0;100,100)/(200,300;200,500) props={#1=>'one'}")
|
||||
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -341,31 +341,31 @@ class DBEdge_TestClass < TestBase
|
|||
assert_equal(s.to_s, "(0,0;0,0) props={}")
|
||||
|
||||
s = RBA::EdgeWithProperties::new(RBA::Edge::new(0, 0, 100, 200), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::EdgeWithProperties::new(RBA::Edge::new(0, 0, 100, 200), pid)
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>one}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0.1,0.2) props={1=>one}")
|
||||
assert_equal(s.transformed(RBA::CplxTrans::new(0.001)).to_s, "(0,0;0.1,0.2) props={1=>one}")
|
||||
assert_equal(s.transformed(RBA::ICplxTrans::new(2.5)).to_s, "(0,0;250,500) props={1=>one}")
|
||||
assert_equal(s.transformed(RBA::Trans::R90).to_s, "(0,0;-200,100) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'one'}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0.1,0.2) props={#1=>'one'}")
|
||||
assert_equal(s.transformed(RBA::CplxTrans::new(0.001)).to_s, "(0,0;0.1,0.2) props={#1=>'one'}")
|
||||
assert_equal(s.transformed(RBA::ICplxTrans::new(2.5)).to_s, "(0,0;250,500) props={#1=>'one'}")
|
||||
assert_equal(s.transformed(RBA::Trans::R90).to_s, "(0,0;-200,100) props={#1=>'one'}")
|
||||
s2 = s.dup
|
||||
s2.transform(RBA::Trans::R90)
|
||||
assert_equal(s2.to_s, "(0,0;-200,100) props={1=>one}")
|
||||
assert_equal((s * 0.001).to_s, "(0,0;0.1,0.2) props={1=>one}")
|
||||
assert_equal(s.moved(10, 20).to_s, "(10,20;110,220) props={1=>one}")
|
||||
assert_equal(s.moved(RBA::Vector::new(10, 20)).to_s, "(10,20;110,220) props={1=>one}")
|
||||
assert_equal(s2.to_s, "(0,0;-200,100) props={#1=>'one'}")
|
||||
assert_equal((s * 0.001).to_s, "(0,0;0.1,0.2) props={#1=>'one'}")
|
||||
assert_equal(s.moved(10, 20).to_s, "(10,20;110,220) props={#1=>'one'}")
|
||||
assert_equal(s.moved(RBA::Vector::new(10, 20)).to_s, "(10,20;110,220) props={#1=>'one'}")
|
||||
s2 = s.dup
|
||||
s2.move(10, 20)
|
||||
assert_equal(s2.to_s, "(10,20;110,220) props={1=>one}")
|
||||
assert_equal(s2.to_s, "(10,20;110,220) props={#1=>'one'}")
|
||||
s2 = s.dup
|
||||
s2.move(RBA::Vector::new(10, 20))
|
||||
assert_equal(s2.to_s, "(10,20;110,220) props={1=>one}")
|
||||
assert_equal(s2.to_s, "(10,20;110,220) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
@ -374,31 +374,31 @@ class DBEdge_TestClass < TestBase
|
|||
assert_equal(s.to_s, "(0,0;0,0) props={}")
|
||||
|
||||
s = RBA::DEdgeWithProperties::new(RBA::DEdge::new(0, 0, 100, 200), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::DEdgeWithProperties::new(RBA::DEdge::new(0, 0, 100, 200), pid)
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>one}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;250,500) props={1=>one}")
|
||||
assert_equal(s.transformed(RBA::DCplxTrans::new(0.001)).to_s, "(0,0;0.1,0.2) props={1=>one}")
|
||||
assert_equal(s.transformed(RBA::VCplxTrans::new(2.5)).to_s, "(0,0;250,500) props={1=>one}")
|
||||
assert_equal(s.transformed(RBA::DTrans::R90).to_s, "(0,0;-200,100) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'one'}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;250,500) props={#1=>'one'}")
|
||||
assert_equal(s.transformed(RBA::DCplxTrans::new(0.001)).to_s, "(0,0;0.1,0.2) props={#1=>'one'}")
|
||||
assert_equal(s.transformed(RBA::VCplxTrans::new(2.5)).to_s, "(0,0;250,500) props={#1=>'one'}")
|
||||
assert_equal(s.transformed(RBA::DTrans::R90).to_s, "(0,0;-200,100) props={#1=>'one'}")
|
||||
s2 = s.dup
|
||||
s2.transform(RBA::DTrans::R90)
|
||||
assert_equal(s2.to_s, "(0,0;-200,100) props={1=>one}")
|
||||
assert_equal((s * 0.001).to_s, "(0,0;0.1,0.2) props={1=>one}")
|
||||
assert_equal(s.moved(10, 20).to_s, "(10,20;110,220) props={1=>one}")
|
||||
assert_equal(s.moved(RBA::DVector::new(10, 20)).to_s, "(10,20;110,220) props={1=>one}")
|
||||
assert_equal(s2.to_s, "(0,0;-200,100) props={#1=>'one'}")
|
||||
assert_equal((s * 0.001).to_s, "(0,0;0.1,0.2) props={#1=>'one'}")
|
||||
assert_equal(s.moved(10, 20).to_s, "(10,20;110,220) props={#1=>'one'}")
|
||||
assert_equal(s.moved(RBA::DVector::new(10, 20)).to_s, "(10,20;110,220) props={#1=>'one'}")
|
||||
s2 = s.dup
|
||||
s2.move(10, 20)
|
||||
assert_equal(s2.to_s, "(10,20;110,220) props={1=>one}")
|
||||
assert_equal(s2.to_s, "(10,20;110,220) props={#1=>'one'}")
|
||||
s2 = s.dup
|
||||
s2.move(RBA::DVector::new(10, 20))
|
||||
assert_equal(s2.to_s, "(10,20;110,220) props={1=>one}")
|
||||
assert_equal(s2.to_s, "(10,20;110,220) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;100,200) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
|
|||
|
|
@ -970,7 +970,7 @@ class DBEdges_TestClass < TestBase
|
|||
|
||||
r = RBA::Edges::new([ RBA::EdgeWithProperties::new(RBA::Edge::new(0, 0, 100, 100), { 1 => "one" }) ])
|
||||
assert_equal(r.to_s, "(0,0;100,100){1=>one}")
|
||||
assert_equal(r[0].to_s, "(0,0;100,100) props={1=>one}")
|
||||
assert_equal(r[0].to_s, "(0,0;100,100) props={#1=>'one'}")
|
||||
|
||||
r = RBA::Edges::new([])
|
||||
assert_equal(r.to_s, "")
|
||||
|
|
@ -1040,15 +1040,15 @@ class DBEdges_TestClass < TestBase
|
|||
r.insert(RBA::EdgeWithProperties::new(RBA::Edge::new(0, 0, 100, 0), { 1 => "one" }))
|
||||
r.insert(RBA::Edge::new(10, 0, 110, 0))
|
||||
s = r.each.collect(&:to_s).join(";")
|
||||
assert_equal(s, "(10,0;110,0) props={};(0,0;100,0) props={1=>one}")
|
||||
assert_equal(s, "(10,0;110,0) props={};(0,0;100,0) props={#1=>'one'}")
|
||||
s = r.each_merged.collect(&:to_s).join(";")
|
||||
assert_equal(s, "(10,0;110,0) props={};(0,0;100,0) props={1=>one}")
|
||||
assert_equal(s, "(10,0;110,0) props={};(0,0;100,0) props={#1=>'one'}")
|
||||
|
||||
r = RBA::Edges::new
|
||||
r.insert(RBA::EdgeWithProperties::new(RBA::Edge::new(0, 0, 100, 0), { 1 => "one" }))
|
||||
r.insert(RBA::EdgeWithProperties::new(RBA::Edge::new(10, 0, 110, 0), { 1 => "one" }))
|
||||
s = r.each_merged.collect(&:to_s).join(";")
|
||||
assert_equal(s, "(0,0;110,0) props={1=>one}")
|
||||
assert_equal(s, "(0,0;110,0) props={#1=>'one'}")
|
||||
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -341,16 +341,16 @@ class DBPath_TestClass < TestBase
|
|||
assert_equal(s.to_s, "() w=0 bx=0 ex=0 r=false props={}")
|
||||
|
||||
s = RBA::PathWithProperties::new(RBA::Path::new([ [0,0], [100, 0] ], 100), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::PathWithProperties::new(RBA::Path::new([ [0,0], [100, 0] ], 100), pid)
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={1=>one}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0.1,0) w=0.1 bx=0 ex=0 r=false props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={#1=>'one'}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0.1,0) w=0.1 bx=0 ex=0 r=false props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
@ -359,16 +359,16 @@ class DBPath_TestClass < TestBase
|
|||
assert_equal(s.to_s, "() w=0 bx=0 ex=0 r=false props={}")
|
||||
|
||||
s = RBA::DPathWithProperties::new(RBA::DPath::new([ [0,0], [100, 0] ], 100), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::DPathWithProperties::new(RBA::DPath::new([ [0,0], [100, 0] ], 100), pid)
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={1=>one}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;250,0) w=250 bx=0 ex=0 r=false props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={#1=>'one'}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;250,0) w=250 bx=0 ex=0 r=false props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;100,0) w=100 bx=0 ex=0 r=false props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
|
|||
|
|
@ -122,8 +122,8 @@ class DBPolygonNeighborhood_TestClass < TestBase
|
|||
|
||||
assert_equal(visitor.log,
|
||||
"Polygon: (-1100,0;-1100,1000;-100,1000;-100,0) props={}\n" +
|
||||
" 0: (0,0;0,1000;1000,1000;1000,0) props={1=>one}\n" +
|
||||
"Polygon: (0,0;0,1000;1000,1000;1000,0) props={1=>one}\n" +
|
||||
" 0: (0,0;0,1000;1000,1000;1000,0) props={#1=>'one'}\n" +
|
||||
"Polygon: (0,0;0,1000;1000,1000;1000,0) props={#1=>'one'}\n" +
|
||||
" 0: (-1100,0;-1100,1000;-100,1000;-100,0) props={}\n"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -906,16 +906,16 @@ class DBPolygon_TestClass < TestBase
|
|||
assert_equal(s.to_s, "() props={}")
|
||||
|
||||
s = RBA::PolygonWithProperties::new(RBA::Polygon::new(RBA::Box::new(0, 0, 100, 200)), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::PolygonWithProperties::new(RBA::Polygon::new(RBA::Box::new(0, 0, 100, 200)), pid)
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0,0.2;0.1,0.2;0.1,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0,0.2;0.1,0.2;0.1,0) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
@ -928,16 +928,16 @@ class DBPolygon_TestClass < TestBase
|
|||
assert_equal(s.to_s, "() props={}")
|
||||
|
||||
s = RBA::DPolygonWithProperties::new(RBA::DPolygon::new(RBA::DBox::new(0, 0, 100, 200)), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::DPolygonWithProperties::new(RBA::DPolygon::new(RBA::DBox::new(0, 0, 100, 200)), pid)
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;0,500;250,500;250,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;0,500;250,500;250,0) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
@ -950,16 +950,16 @@ class DBPolygon_TestClass < TestBase
|
|||
assert_equal(s.to_s, "() props={}")
|
||||
|
||||
s = RBA::SimplePolygonWithProperties::new(RBA::SimplePolygon::new(RBA::Box::new(0, 0, 100, 200)), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::SimplePolygonWithProperties::new(RBA::SimplePolygon::new(RBA::Box::new(0, 0, 100, 200)), pid)
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0,0.2;0.1,0.2;0.1,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "(0,0;0,0.2;0.1,0.2;0.1,0) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
@ -972,16 +972,16 @@ class DBPolygon_TestClass < TestBase
|
|||
assert_equal(s.to_s, "() props={}")
|
||||
|
||||
s = RBA::DSimplePolygonWithProperties::new(RBA::DSimplePolygon::new(RBA::DBox::new(0, 0, 100, 200)), { 1 => "one" })
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::DSimplePolygonWithProperties::new(RBA::DSimplePolygon::new(RBA::DBox::new(0, 0, 100, 200)), pid)
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;0,500;250,500;250,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "(0,0;0,500;250,500;250,0) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "(0,0;0,200;100,200;100,0) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
@ -1008,6 +1008,24 @@ class DBPolygon_TestClass < TestBase
|
|||
s = RBA::DSimplePolygonWithProperties::new(RBA::DBox::new(0, 0, 100, 200), { 1 => "one", "key" => 17 })
|
||||
assert_equal(RBA::DSimplePolygonWithProperties::from_bytes(s.to_bytes).to_s, s.to_s)
|
||||
|
||||
# string serialization
|
||||
s = RBA::PolygonWithProperties::new(RBA::Box::new(0, 0, 100, 200), {})
|
||||
assert_equal(RBA::PolygonWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::PolygonWithProperties::new(RBA::Box::new(0, 0, 100, 200), { 1 => "one", "key" => 17 })
|
||||
assert_equal(RBA::PolygonWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::DPolygonWithProperties::new(RBA::DBox::new(0, 0, 100, 200), {})
|
||||
assert_equal(RBA::DPolygonWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::DPolygonWithProperties::new(RBA::DBox::new(0, 0, 100, 200), { 1 => "one", "key" => 17 })
|
||||
assert_equal(RBA::DPolygonWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::SimplePolygonWithProperties::new(RBA::Box::new(0, 0, 100, 200), {})
|
||||
assert_equal(RBA::SimplePolygonWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::SimplePolygonWithProperties::new(RBA::Box::new(0, 0, 100, 200), { 1 => "one", "key" => 17 })
|
||||
assert_equal(RBA::SimplePolygonWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::DSimplePolygonWithProperties::new(RBA::DBox::new(0, 0, 100, 200), {})
|
||||
assert_equal(RBA::DSimplePolygonWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
s = RBA::DSimplePolygonWithProperties::new(RBA::DBox::new(0, 0, 100, 200), { 1 => "one", "key" => 17 })
|
||||
assert_equal(RBA::DSimplePolygonWithProperties::from_s(s.to_s).to_s, s.to_s)
|
||||
|
||||
end
|
||||
|
||||
def test_triangulation
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ class DBRegion_TestClass < TestBase
|
|||
r.insert(RBA::PolygonWithProperties::new(RBA::Box::new(0, 0, 10, 20), { 1 => 'value' }))
|
||||
r.insert(RBA::Box::new(1, 2, 11, 22))
|
||||
assert_equal(r[0].to_s, "(1,2;1,22;11,22;11,2) props={}")
|
||||
assert_equal(r[1].to_s, "(0,0;0,20;10,20;10,0) props={1=>value}")
|
||||
assert_equal(r[1].to_s, "(0,0;0,20;10,20;10,0) props={#1=>'value'}")
|
||||
|
||||
r = RBA::Region::new(ly.begin_shapes(c1.cell_index, l2), "*")
|
||||
assert_equal(csort(r.to_s), csort("(-11,-21;-11,-19;-9,-19;-9,-21);(9,19;9,21;11,21;11,19);(-11,79;-11,81;-9,81;-9,79);(9,119;9,121;11,121;11,119);(189,79;189,81;191,81;191,79);(209,119;209,121;211,121;211,119)"))
|
||||
|
|
@ -1635,20 +1635,20 @@ class DBRegion_TestClass < TestBase
|
|||
r.insert(RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), { 1 => "one" }))
|
||||
r.insert(RBA::Box::new(10, 20, 110, 220))
|
||||
s = r.each.collect(&:to_s).join(";")
|
||||
assert_equal(s, "(10,20;10,220;110,220;110,20) props={};(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal(s, "(10,20;10,220;110,220;110,20) props={};(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
rr = r.dup
|
||||
rr.join_properties_on_merge = true
|
||||
assert_equal(rr.join_properties_on_merge, true)
|
||||
s = rr.each_merged.collect(&:to_s).join(";")
|
||||
assert_equal(s, "(0,0;0,200;10,200;10,220;110,220;110,20;100,20;100,0) props={1=>one}")
|
||||
assert_equal(s, "(0,0;0,200;10,200;10,220;110,220;110,20;100,20;100,0) props={#1=>'one'}")
|
||||
s = r.each_merged.collect(&:to_s).join(";")
|
||||
assert_equal(s, "(10,20;10,220;110,220;110,20) props={};(0,0;0,200;100,200;100,0) props={1=>one}")
|
||||
assert_equal(s, "(10,20;10,220;110,220;110,20) props={};(0,0;0,200;100,200;100,0) props={#1=>'one'}")
|
||||
|
||||
r = RBA::Region::new
|
||||
r.insert(RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), { 1 => "one" }))
|
||||
r.insert(RBA::BoxWithProperties::new(RBA::Box::new(10, 20, 110, 220), { 1 => "one" }))
|
||||
s = r.each_merged.collect(&:to_s).join(";")
|
||||
assert_equal(s, "(0,0;0,200;10,200;10,220;110,220;110,20;100,20;100,0) props={1=>one}")
|
||||
assert_equal(s, "(0,0;0,200;10,200;10,220;110,220;110,20;100,20;100,0) props={#1=>'one'}")
|
||||
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -264,16 +264,16 @@ class DBText_TestClass < TestBase
|
|||
assert_equal(s.to_s, "('',r0 0,0) props={}")
|
||||
|
||||
s = RBA::TextWithProperties::new(RBA::Text::new("text", RBA::Trans::R90), { 1 => "one" })
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::TextWithProperties::new(RBA::Text::new("text", RBA::Trans::R90), pid)
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={1=>one}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "('text',r90 0,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={#1=>'one'}")
|
||||
assert_equal((RBA::CplxTrans::new(0.001) * s).to_s, "('text',r90 0,0) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
@ -282,16 +282,16 @@ class DBText_TestClass < TestBase
|
|||
assert_equal(s.to_s, "('',r0 0,0) props={}")
|
||||
|
||||
s = RBA::DTextWithProperties::new(RBA::DText::new("text", RBA::Trans::R90), { 1 => "one" })
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={#1=>'one'}")
|
||||
|
||||
pid = RBA::Layout::properties_id({ 1 => "one" })
|
||||
s = RBA::DTextWithProperties::new(RBA::DText::new("text", RBA::Trans::R90), pid)
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={1=>one}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "('text',r90 0,0) props={1=>one}")
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={#1=>'one'}")
|
||||
assert_equal((RBA::VCplxTrans::new(2.5) * s).to_s, "('text',r90 0,0) props={#1=>'one'}")
|
||||
assert_equal(s.property(1), "one")
|
||||
assert_equal(s.properties, { 1 => "one" })
|
||||
s.set_property(1, "xxx")
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={1=>xxx}")
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={#1=>'xxx'}")
|
||||
s.delete_property(1)
|
||||
assert_equal(s.to_s, "('text',r90 0,0) props={}")
|
||||
assert_equal(s.property(1), nil)
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ class DBTexts_TestClass < TestBase
|
|||
|
||||
r = RBA::Texts::new
|
||||
r.insert(RBA::TextWithProperties::new(RBA::Text::new("string", RBA::Trans::new), { 1 => "value" }))
|
||||
assert_equal(r[0].to_s, "('string',r0 0,0) props={1=>value}")
|
||||
assert_equal(r[0].to_s, "('string',r0 0,0) props={#1=>'value'}")
|
||||
|
||||
dss = RBA::DeepShapeStore::new
|
||||
r = RBA::Texts::new(ly.begin_shapes(c1.cell_index, l1), dss)
|
||||
|
|
@ -477,7 +477,7 @@ class DBTexts_TestClass < TestBase
|
|||
r.insert(RBA::TextWithProperties::new(RBA::Text::new("abc", RBA::Trans::new), { 1 => "one" }))
|
||||
r.insert(RBA::Text::new("xuv", RBA::Trans::new))
|
||||
s = r.each.collect(&:to_s).join(";")
|
||||
assert_equal(s, "('xuv',r0 0,0) props={};('abc',r0 0,0) props={1=>one}")
|
||||
assert_equal(s, "('xuv',r0 0,0) props={};('abc',r0 0,0) props={#1=>'one'}")
|
||||
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue