[Javaowl-commit] reasoner/design draft.scm,1.4,1.5 reasoner.scm,1.2,1.3

[Gerardo H. <ma...@us...>]

Update of /cvsroot/javaowl/reasoner/design
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29684

Modified Files:
	draft.scm reasoner.scm 
Log Message:
Now it really works...


Index: draft.scm
===================================================================
RCS file: /cvsroot/javaowl/reasoner/design/draft.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** draft.scm	7 Aug 2004 01:41:57 -0000	1.4
--- draft.scm	7 Aug 2004 02:24:49 -0000	1.5
***************
*** 33,36 ****
--- 33,41 ----
      ($= Test2 ($allValuesFrom hasChild $TOP))))
  
+ (define tbox4
+   '(($= Woman ($intersection Person Female))
+     ($= Man ($intersection Person ($complement Female)))
+     ($= OnlySons ($allValuesFrom hasChild Man))))
+ 
  ;(Woman x)
  ;(Man y)
***************
*** 44,50 ****
      (hasChild a b)))
  
! (define abox2
    '((Woman x)
      (Man y)
      ;(Undefined z)
!     ))
\ No newline at end of file
--- 49,62 ----
      (hasChild a b)))
  
! (define abox3
    '((Woman x)
      (Man y)
      ;(Undefined z)
!     ))
! 
! (define abox4
!   '((hasChild Gerardo David)
!     (hasChild Gerardo Daniel)
!     (Man David)
!     (Man Daniel)
!     (OnlySons Gerardo)))
\ No newline at end of file

Index: reasoner.scm
===================================================================
RCS file: /cvsroot/javaowl/reasoner/design/reasoner.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** reasoner.scm	7 Aug 2004 01:41:57 -0000	1.2
--- reasoner.scm	7 Aug 2004 02:24:49 -0000	1.3
***************
*** 125,129 ****
                  (apply-intersection other-concepts instance (if (member term r-abox)
                                                                  r-abox
!                                                                 (cons term r-abox)))))))
         (check-allValuesFrom
          (lambda (instances concept r-abox)
--- 125,129 ----
                  (apply-intersection other-concepts instance (if (member term r-abox)
                                                                  r-abox
!                                                                 (apply-rules (cons term r-abox))))))))
         (check-allValuesFrom
          (lambda (instances concept r-abox)
***************
*** 142,146 ****
                  (concept (second role-concept)))
              (check-allValuesFrom (map third (filter (lambda (x) (and (equal? role (first x))
!                                                                      (eq? instance (second x)))) r-abox))
                                   concept r-abox))))
         
--- 142,146 ----
                  (concept (second role-concept)))
              (check-allValuesFrom (map third (filter (lambda (x) (and (equal? role (first x))
!                                                                      (equal? instance (second x)))) r-abox))
                                   concept r-abox))))