Bug fixes

scripts/show_me

@@ -115,7 +115,7 @@ def about_id(entity_id, show_attributes=True):
         print("Belongs to map {} (\'{}\')".format(parent_map.entity_id, parent_map.get_name()))
 
     if inside_regions:
-        print("Inside regions {}".format(str(list(map(Region.name, inside_regions)))))
+        print("Inside regions {}".format(str(list(map(Region.get_name, inside_regions)))))
 
     if not typed:
         print("Entity {} does not exist".format(entity_id))

sql/schema_postgresql.sql

@@ -466,6 +466,8 @@ VALUES ('answer_to', 'id'),
 ('has', 'id'),
 ('height', 'float'),
 ('width', 'float'),
+('depth', 'float'),
+('weight', 'float'),
 ('is_a', 'id'),
 ('is_connected', 'id'),
 ('is_delivered', 'id'),
@@ -493,6 +495,8 @@ INSERT INTO concepts
 VALUES (2, 'robot'), (3, 'map'), (4, 'point'), (5, 'pose'), (6, 'region'), (7, 'door');
 INSERT INTO instance_of
 VALUES (1, 'robot');
+INSERT INTO entity_attributes_str
+VALUES (1, 'name', 'robot');
 
 /* Manual inserts will mess up the SERIAL sequence, so we have to manually bump the number*/
 SELECT setval('entities_entity_id_seq', max(entity_id))

src/knowledge_representation/knowledge_loader.py

@@ -16,8 +16,10 @@ def add_attributes(entity, attributes):
     for attribute in attributes:
         name = attribute["name"]
         value = attribute["value"]
-        entity.add_attribute(name, value)
-
+        if isinstance(value, bool):
+            entity.add_bool_attribute(name, value)
+        else:
+            entity.add_attribute(name, value)
 
 def add_instance_of(ltmc, instance, concept_names):
     for concept_name in concept_names:

src/knowledge_representation/map_loader.py

@@ -225,8 +225,8 @@ def dim_match(element, w, h):
     if viewbox != target_viewbox:
         problems.append("SVG viewbox is {} but should be {}".format(viewbox, target_viewbox))
     dim_match(svg, map_info["width"], map_info["height"])
-    ori_is_zero(image)
-    dim_match(image, map_info["width"], map_info["height"])
+    # ori_is_zero(image)
+    # dim_match(image, map_info["width"], map_info["height"])
     return problems
 
 
@@ -338,6 +338,7 @@ def process_paths(path_groups):
         name = text
 
         transform = get_transform(group)
+        # sprint (transform)
 
         # Single line segment path => pose
         try:
@@ -359,7 +360,7 @@ def process_paths(path_groups):
             points = map(lambda l: l[0], lines)
             points = map(lambda p: (float_s3(p[0]), float_s3(p[1])), points)
             points = map(lambda p: apply_transform(p, transform), points)
-            regions.append((name, points))
+            regions.append((name, list(points)))
         else:
             warn("Encountered path that couldn't be parsed {}".format(name))
     return poses, regions

src/libknowledge_rep/python_wrapper.cpp

@@ -400,7 +400,7 @@ BOOST_PYTHON_MODULE(_libknowledge_rep_wrapper_cpp)
       .def<bool (Entity::*)(const string&, const Entity&)>("add_attribute", &Entity::addAttribute)
       .def<bool (Entity::*)(const string&, uint)>("add_attribute", &Entity::addAttribute)
       .def<bool (Entity::*)(const string&, int)>("add_attribute", &Entity::addAttribute)
-      .def<bool (Entity::*)(const string&, bool)>("add_attribute", &Entity::addAttribute)
+      .def<bool (Entity::*)(const string&, bool)>("add_bool_attribute", &Entity::addAttribute)
       .def<bool (Entity::*)(const string&, double)>("add_attribute", &Entity::addAttribute)
 
       .def<bool (Entity::*)(const string&, const string&)>("add_attribute", &Entity::addAttribute)