Commit 252e1d97 authored by Jens Nevens's avatar Jens Nevens

git subrepo pull (merge) systems/category-hierarchies

subrepo:
  subdir:   "systems/category-hierarchies"
  merged:   "956fe29"
upstream:
  origin:   "gitlab@gitlab.ai.vub.ac.be:rvantrijp/category-hierarchies.git"
  branch:   "master"
  commit:   "10fb8df"
git-subrepo:
  version:  "0.4.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "5d6aba9"
parent 40204c81
......@@ -6,7 +6,7 @@
[subrepo]
remote = gitlab@gitlab.ai.vub.ac.be:rvantrijp/category-hierarchies.git
branch = master
commit = aedefd25b891adf79cf6f07c3bc1c3664a6c577d
commit = 10fb8df8db3452ce540bdc4f84838aed08a04bb5
parent = c1318cc5b99863d52227e9890c00f3d1338bc514
method = merge
cmdver = 0.4.0
......@@ -19,6 +19,7 @@
fcg-construction-set-with-type-hierarchy
add-category add-categories add-link
get-type-hierarchy
set-type-hierarchy
directed-path-p
node-p
coherence))
......@@ -51,7 +52,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defmethod copy-object-content ((source type-hierarchy) (destination type-hierarchy))
(setf (graph destination) (graph source)))
(setf (graph destination) (copy-graph (graph source))))
(defgeneric add-category (category type-hierarchy))
(defmethod add-category ((category symbol) (type-hierarchy type-hierarchy))
......@@ -148,6 +149,10 @@
(when (field? (blackboard cxn-inventory) :type-hierarchy)
(get-data (blackboard cxn-inventory) :type-hierarchy)))
(defun set-type-hierarchy (cxn-inventory type-hierarchy)
"Returns the type-hierarchy of cxn-inventory or nil if there is no such slot"
(set-data (blackboard cxn-inventory) :type-hierarchy type-hierarchy))
(defgeneric undirected-path (node1 node-2 type-hierarchy))
(defmethod undirected-path ((n1 integer) (n2 integer) (type-hierarchy type-hierarchy))
"returns any path between two nodes, doesn't take into account direction of links"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment