[Corelinux-clcvs] CVS: clfw/clfw MetaClass.hpp,NONE,1.1 Makefile.am,1.17,1.18 MetaSpace.hpp,1.2,1.3 MetaType.hpp,1.21,1.22 Ontology.hpp,1.3,1.4

[Frank V. C. <fr...@us...>]

Update of /cvsroot/corelinux/clfw/clfw
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20673/clfw

Modified Files:
	Makefile.am MetaSpace.hpp MetaType.hpp Ontology.hpp 
Added Files:
	MetaClass.hpp 
Log Message:
116737 Ontology

***** Error reading new file: (2, 'No such file or directory')
Index: Makefile.am
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** Makefile.am	2000/11/11 17:45:54	1.17
--- Makefile.am	2000/11/15 01:14:31	1.18
***************
*** 32,35 ****
--- 32,36 ----
  		UnsignedShortInteger.hpp	\
  		MetaSpace.hpp				\
+ 		MetaClass.hpp				\
  		Ontology.hpp				\
          Makefile.am 

Index: MetaSpace.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/MetaSpace.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MetaSpace.hpp	2000/11/12 03:22:06	1.2
--- MetaSpace.hpp	2000/11/15 01:14:31	1.3
***************
*** 53,57 ****
                 */
  
!       static   OntologyPtr getOntology( char *domain = NULLPTR );
  
                 /**
--- 53,57 ----
                 */
  
!       static   OntologyPtr getOntology( CharCptr domain = NULLPTR );
  
                 /**

Index: MetaType.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/MetaType.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** MetaType.hpp	2000/11/11 17:45:54	1.21
--- MetaType.hpp	2000/11/15 01:14:31	1.22
***************
*** 869,874 ****
  
                 /**
                 get the instance member descriptors
!                @return an array of MemberDescriptors
                 */
  
--- 869,881 ----
  
                 /**
+                get the parent count
+                @return Count of parents (0 if root)
+                */
+ 
+                Count getParentCount( void ) const;
+ 
+                /**
                 get the instance member descriptors
!                @return an array of MemberDescriptor structures
                 */
  
***************
*** 876,883 ****
--- 883,905 ----
  
                 /**
+                get the instance member (attributes) count
+                @return Count of data members
+                */
+ 
+                Count getInstanceMemberCount( void ) const;
+ 
+                /**
                 get the instance dispatch descriptors
+                @return an array of DispatchDescriptor structures
                 */
  
                 DispatchDescriptorCptr * const getInstanceFunctions( void ) const;
+ 
+                /**
+                get the dispatch functions count
+                @return Count of dispatch functions
+                */
+ 
+                Count getInstanceFunctionCount( void ) const;
  
                 /**

Index: Ontology.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/Ontology.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Ontology.hpp	2000/11/12 03:22:06	1.3
--- Ontology.hpp	2000/11/15 01:14:31	1.4
***************
*** 22,31 ****
  */
  
  namespace   corelinux
  {
     DECLARE_CLASS( Ontology );
  
!    /*!
!      \class Ontology represents a domain semantic network
     */
  
--- 22,52 ----
  */
  
+ #if   !defined(__CLFWCOMMON_HPP)
+ #include <ClfwCommon.hpp>
+ #endif
+ 
+ #if   !defined(__METACLASS_HPP)
+ #include <MetaClass.hpp>
+ #endif
+ 
+ #if   !defined(__MAP_HPP)
+ #include <corelinux/Map.hpp>
+ #endif
+ 
  namespace   corelinux
  {
+ 
+    CORELINUX_MAP
+       ( 
+          MetaTypeCptr, 
+          MetaClassPtr,
+          less<MetaTypeCptr>,
+          ClassMap 
+       );
+ 
     DECLARE_CLASS( Ontology );
  
!    /**
!    An Ontology represents a domain semantic network lattice
     */
  
***************
*** 33,38 ****
--- 54,65 ----
     {
  
+       friend class MetaSpace;
+ 
     public:
  
+       //
+       // Constructors and destructors
+       //
+ 
                          /**
                          Default constructor takes a domain name
***************
*** 48,59 ****
--- 75,95 ----
        virtual           ~Ontology( void );
  
+       //
+       // Operator overloads
+       //
                 /// Equality operator 
  
                 bool  operator==( OntologyCref ) const;
  
+       //
+       // Accessors
+       //
                 /// gets the domain name
  
                 CharCptr getDomainName( void ) const;
  
+       //
+       // Mutators
+       //
                 /**
                 Add a new metatype to this ontology
***************
*** 70,81 ****
                 updates the child reference of an existing
                 type
-                @param MetaType const pointer to add
                 @param MetaType const pointer to add to
                 */
  
!       virtual  void  addAsChild( MetaTypeCptr , MetaTypeCptr );
  
     protected:
  
  
     private:
--- 106,163 ----
                 updates the child reference of an existing
                 type
                 @param MetaType const pointer to add to
+                @param MetaType const pointer to add 
+                */
+ 
+       virtual  void  addAsChild( MetaTypeCptr , MetaClassCptr )
+                   throw ( NullPointerException );
+ 
+                /**
+                Add a child to a member of the ontology. This
+                does not store the type being added, but only
+                updates the child reference of an existing
+                type
+                @param UniversalIdentifier const reference to add to
+                @param MetaType const pointer to add 
+                */
+ 
+       virtual  void  addAsChild( UniversalIdentifierCref , MetaTypeCptr )
+                   throw ( NullPointerException );
+ 
+       //
+       // Iterator factory methods
+       //
+ 
+                /**
+                Create a iterator over all the entries of the ontology
+                @return Iterator<MetaClassCptr> pointer
+                */
+ 
+       virtual  Iterator<MetaClassCptr> *createIterator( void );
+ 
+                /**
+                Create a iterator over the roots of the ontology
+                @return Iterator<MetaClassCptr> pointer
+                */
+ 
+       virtual  Iterator<MetaClassCptr> *createRootIterator( void );
+ 
+                /**
+                Destroy the iterator
+                @param Iterator<MetaClassCptr> pointer
                 */
  
!       virtual  void  destroyIterator( Iterator<MetaClassCptr> * );
  
     protected:
  
+                /**
+                Gets the class from the local ontology, or where it
+                exists
+                @param MetaType const pointer
+                @return MetaClass const pointer
+                */
+          
+                MetaClassCptr getClass( MetaTypeCptr ) const;
  
     private:
***************
*** 92,100 ****
                 OntologyRef operator=( OntologyCref );
  
  
     private:
  
                 CharPtr     theDomainName;
! 
  
     };
--- 174,195 ----
                 OntologyRef operator=( OntologyCref );
  
+                /// Seed the ontology before creating hierarchy
+ 
+                void  seedMetaType( MetaTypeCptr );
+ 
+                /// Establish hierarchy
  
+                void  initialize( void );
+ 
+                /// Sets the type in this ontology
+ 
+                void  insertType( MetaTypeCptr, MetaClassPtr );
+ 
     private:
  
                 CharPtr     theDomainName;
!                bool        theInitializedFlag;
!                ClassMap    theClassMap;
!                ClassMap    theRootMap;
  
     };