Commit 467b3e24 authored by remivantrijp's avatar remivantrijp
Browse files

Solving subrepo issues

parent 2379b241
......@@ -128,11 +128,8 @@
;; This function returns multiple values for storing in transient structures.
(defun dependency-string-append-named-entities (dependency-tree)
(let* ((utterance (nlp-tools:dp-build-utterance-from-dependency-tree dependency-tree))
<<<<<<< HEAD
(named-entities-result (get-penelope-named-entities-for-beng utterance))
=======
(named-entities-result (nlp-tools::get-penelope-named-entities utterance))
>>>>>>> refs/subrepo/systems/fcg-hybrids/fetch
(named-entities (mapcar #'first named-entities-result)))
(loop for named-entity in named-entities
when (find #\space named-entity) ;; Composed of multiple parts.
......@@ -235,8 +232,6 @@
(t
dependent))))))
<<<<<<< HEAD
;; Compare:
;; --------
;; (preprocess-using-dependency-tree "I saw Barack Obama" :preprocessing-steps (list #'dependency-string-append-named-entities))
......@@ -244,9 +239,7 @@
;; (preprocess-using-dependency-tree "I saw Barack Obama and his ever-radiant wife Michelle" :preprocessing-steps (list #'dependency-string-append-named-entities))
;; (preprocess-using-dependency-tree "I saw Barack Obama and his ever-radiant wife Michelle" :preprocessing-steps (list #'dependency-string-append-compounds-in-np #'dependency-string-append-named-entities))
;; (preprocess-using-dependency-tree "The news pictures of the photographer" :preprocessing-steps (list #'dependency-string-append-compounds))
=======
;; Examples:
;; ---------
;; (preprocess-using-dependency-tree "I saw Barack Obama." :preprocessing-steps (list #'dependency-string-append-named-entities))
;; (preprocess-using-dependency-tree "I saw Barack Obama." :preprocessing-steps (list #'dependency-string-append-named-entities #'dependency-remove-punct))
>>>>>>> refs/subrepo/systems/fcg-hybrids/fetch
......@@ -19,7 +19,6 @@
(export '(represent-constituent-structure))
<<<<<<< HEAD
;; ICA = Immediate Constituent Analysis
;;
;; Contents:
......@@ -42,7 +41,7 @@
(defgeneric represent-constituent-structure (analysis transient-structure key cxn-inventory &optional language)
(:documentation "Given a constituent structure analysis, expand the transient structure with units for phrases and constituency relations."))
=======
(defgeneric represent-constituent-structure (analysis transient-structure key cxn-inventory &optional language)
(:documentation "Given a constituent structure analysis, expand the transient structure with units for phrases and constituency relations."))
......@@ -70,4 +69,3 @@
"Make a new unit name."
(make-id (format nil "~a-unit" x)))
;; (make-unit-id 's)
>>>>>>> refs/subrepo/systems/fcg-hybrids/fetch
......@@ -30,7 +30,6 @@
;; Example:
;; (represent-functional-structure dependency-tree transient-structure t :english)
;;
<<<<<<< HEAD
;; The default method, implemented here, simply adds information from a spacy-dependency parse (provided by the :nlp-tools package)
;; to a transient structure.
......@@ -68,7 +67,6 @@
(setf (left-pole-structure transient-structure)
(append (left-pole-structure transient-structure) new-units))
transient-structure))
=======
;;
;; About functional structure:
;; ---------------------------
......@@ -77,8 +75,3 @@
;; constructions (e.g. the Subject-Predicate construction), through preprocessing (dependency parsing),
;; or a combination of both. Below are a couple of helper functions to identify the most important
;; relations.
>>>>>>> refs/subrepo/systems/fcg-hybrids/fetch
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