Permalink
Browse files

GIA 3d6a - start implement GIA_NEURAL_NETWORK:GIA_NEURAL_NETWORK_SYMB…

…OLIC_CORE

GIA 3d6a - extract GIA_NEURAL_NETWORK:GIA_NEURAL_NETWORK_NON_SEMANTIC from GIA_NEURAL_NETWORK
GIA 3d6a - extract GIA_NEURAL_NETWORK_USE_ARTIFICIAL_INSTANCE_NEURON_SYNAPSES from GIA_NEURAL_NETWORK:GIA_NEURAL_NETWORK_NON_SEMANTIC
GIA 3d6a - [CHECKTHIS] update GIAneuralNetworkOperationsClass::getSpecificConceptNeuronAndLink to execute generateSubnetFromConnectedInstances on both concepts and specific concepts
GIA 3d6a - [CHECKTHIS] fix bug in GIAneuralNetworkOperationsClass::generateNeuralNetFromSemanticNet; set specificConceptEntityArtificial.entityType = GIA_ENTITY_TYPE_CONCEPT (and pass previousEntityIsConcept to generateSubnetFromConnectedInstances instead of previousEntity)
GIA 3d6a - [CHECKTHIS] fix bug in GIAneuralNetworkOperationsClass::generateSubnetFromConnectedInstances; change to ANNconnectionType2 = GIA_ANN_CONNECTION_TYPE_CONCEPT_TO_INSTANCE;
GIA 3d6a - [CHECKTHIS] GIA_NEURAL_NETWORK_SYMBOLIC_CORE: when parsing concept definition structures (generateSubnetFromConnectedInstances), create direct connections between concept neurons for concept property features: specific concept same reference set qualities (eg 'red' in 'red dogs are happy') and non-specific concept non-same reference set qualities (eg 'happy' in 'dogs are happy')
  • Loading branch information...
baxterai committed Nov 14, 2017
1 parent b3d202d commit fcb5ee4fc581609031fa1c8962e7737366738a1b
Showing with 1,018 additions and 428 deletions.
  1. +1 −1 GIA/GIAbot.cpp
  2. +1 −1 GIA/GIAbot.hpp
  3. +1 −1 GIA/GIAconditionNodeClass.cpp
  4. +1 −1 GIA/GIAconditionNodeClass.hpp
  5. +1 −1 GIA/GIAcxlConversion.cpp
  6. +1 −1 GIA/GIAcxlConversion.hpp
  7. +1 −1 GIA/GIAdatabase.cpp
  8. +1 −1 GIA/GIAdatabase.hpp
  9. +1 −1 GIA/GIAdraw.cpp
  10. +1 −1 GIA/GIAdraw.hpp
  11. +1 −1 GIA/GIAentityConnectionClass.cpp
  12. +1 −1 GIA/GIAentityConnectionClass.hpp
  13. +7 −1 GIA/GIAentityNodeClass.cpp
  14. +9 −3 GIA/GIAentityNodeClass.hpp
  15. +64 −29 GIA/GIAglobalDefs.hpp
  16. +27 −15 GIA/GIAmain.cpp
  17. +7 −3 GIA/GIAmain.hpp
  18. +91 −91 GIA/{GIAneuralNetwork.cpp → GIAneuralNetworkNonSemantic.cpp}
  19. +7 −7 GIA/{GIAneuralNetwork.hpp → GIAneuralNetworkNonSemantic.hpp}
  20. +566 −182 GIA/GIAneuralNetworkOperations.cpp
  21. +59 −12 GIA/GIAneuralNetworkOperations.hpp
  22. +38 −0 GIA/GIAneuralNetworkSymbolicCore.cpp
  23. +50 −0 GIA/GIAneuralNetworkSymbolicCore.hpp
  24. +1 −1 GIA/GIAnlg.cpp
  25. +1 −1 GIA/GIAnlg.hpp
  26. +1 −1 GIA/GIAnlp.cpp
  27. +1 −1 GIA/GIAnlp.hpp
  28. +1 −1 GIA/GIAnlpParser.cpp
  29. +1 −1 GIA/GIAnlpParser.hpp
  30. +1 −1 GIA/GIApreprocessor.cpp
  31. +1 −1 GIA/GIApreprocessor.hpp
  32. +1 −1 GIA/GIApreprocessorLogicReference.cpp
  33. +1 −1 GIA/GIApreprocessorLogicReference.hpp
  34. +1 −1 GIA/GIApreprocessorMultiwordReduction.cpp
  35. +1 −1 GIA/GIApreprocessorMultiwordReduction.hpp
  36. +4 −2 GIA/GIApreprocessorMultiwordReductionClass.cpp
  37. +10 −8 GIA/GIApreprocessorMultiwordReductionClass.hpp
  38. +5 −1 GIA/GIApreprocessorReferenceSet.cpp
  39. +1 −1 GIA/GIApreprocessorReferenceSet.hpp
  40. +2 −2 GIA/GIApreprocessorSentenceClass.cpp
  41. +1 −1 GIA/GIApreprocessorSentenceClass.hpp
  42. +1 −1 GIA/GIAquery.cpp
  43. +1 −1 GIA/GIAquery.hpp
  44. +1 −1 GIA/GIArules.xml
  45. +1 −1 GIA/GIAsemanticParser.cpp
  46. +1 −1 GIA/GIAsemanticParser.hpp
  47. +1 −1 GIA/GIAsemanticParserDatabase.cpp
  48. +1 −1 GIA/GIAsemanticParserDatabase.hpp
  49. +1 −1 GIA/GIAsemanticParserOperations.cpp
  50. +1 −1 GIA/GIAsemanticParserOperations.hpp
  51. +1 −1 GIA/GIAsemanticParserTranslator.cpp
  52. +1 −1 GIA/GIAsemanticParserTranslator.hpp
  53. +1 −1 GIA/GIAsentenceClass.cpp
  54. +1 −1 GIA/GIAsentenceClass.hpp
  55. +1 −1 GIA/GIAtranslator.cpp
  56. +1 −1 GIA/GIAtranslator.hpp
  57. +1 −1 GIA/GIAtranslatorApplyAdvancedFeatures.cpp
  58. +1 −1 GIA/GIAtranslatorApplyAdvancedFeatures.hpp
  59. +1 −1 GIA/GIAtranslatorDefineGrammar.cpp
  60. +1 −1 GIA/GIAtranslatorDefineGrammar.hpp
  61. +1 −1 GIA/GIAtranslatorDefineReferencing.cpp
  62. +1 −1 GIA/GIAtranslatorDefineReferencing.hpp
  63. +1 −1 GIA/GIAtranslatorDefineSubstances.cpp
  64. +1 −1 GIA/GIAtranslatorDefineSubstances.hpp
  65. +1 −1 GIA/GIAtranslatorDefs.hpp
  66. +1 −1 GIA/GIAtranslatorGeneric.cpp
  67. +1 −1 GIA/GIAtranslatorGeneric.hpp
  68. +1 −1 GIA/GIAtranslatorLinkEntities.cpp
  69. +1 −1 GIA/GIAtranslatorLinkEntities.hpp
  70. +1 −1 GIA/GIAtranslatorLinkEntitiesDynamic.cpp
  71. +1 −1 GIA/GIAtranslatorLinkEntitiesDynamic.hpp
  72. +1 −1 GIA/GIAtranslatorOperations.cpp
  73. +1 −1 GIA/GIAtranslatorOperations.hpp
  74. +1 −1 GIA/GIAtranslatorRedistributeRelations.cpp
  75. +1 −1 GIA/GIAtranslatorRedistributeRelations.hpp
  76. +1 −1 GIA/GIAtranslatorRedistributeRelationsRelex.cpp
  77. +1 −1 GIA/GIAtranslatorRedistributeRelationsRelex.hpp
  78. +1 −1 GIA/GIAtranslatorRedistributeRelationsStanford.cpp
  79. +1 −1 GIA/GIAtranslatorRedistributeRelationsStanford.hpp
  80. +1 −1 GIA/GIAtranslatorRules.cpp
  81. +1 −1 GIA/GIAtranslatorRules.hpp
  82. +1 −1 GIA/GIAwordnet.cpp
  83. +1 −1 GIA/GIAwordnet.hpp
  84. +1 −1 GIA/GIAxmlConversion.cpp
  85. +1 −1 GIA/GIAxmlConversion.hpp
  86. +1 −1 GIA/makefile.OpenGIAwithANN.EL7
  87. +1 −1 GIA/makefile.OpenGIAwithANN.UB16
View
@@ -25,7 +25,7 @@
* File Name: GIAbot.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* Requirements: requires text parsed by NLP Parser (eg Relex; available in .CFF format <relations>)
* Description: Converts relation objects into GIA nodes (of type entity, action, condition etc) in GIA network/tree
*
View
@@ -25,7 +25,7 @@
* File Name: GIAbot.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* Requirements: requires text parsed by NLP Parser (eg Relex; available in .CFF format <relations>)
* Description: Converts relation objects into GIA network nodes (of type entity, action, condition etc) in GIA network/tree
*
@@ -25,7 +25,7 @@
* File Name: GIAconditionNodeClass.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
*
*******************************************************************************/
@@ -25,7 +25,7 @@
* File Name: GIAconditionNodeClass.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
*
*******************************************************************************/
View
@@ -25,7 +25,7 @@
* File Name: GIAcxlConversion.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* Description: Converts GIA network nodes into an XML, or converts an XML file into GIA network nodes
* NB this function creates entity idActiveListReorderdIDforXMLsave values upon write to speed up linking process (does not use original idActiveList values)
*
View
@@ -25,7 +25,7 @@
* File Name: GIAcxlConversion.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* Description: Converts GIA network nodes into an XML, or converts an XML file into GIA network nodes
*
*******************************************************************************/
View
@@ -25,7 +25,7 @@
* File Name: GIAdatabase.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* Requirements: requires a GIA network created for both existing knowledge and the query (question)
* Description: performs simple GIA database functions (storing nodes in ordered arrays/vectors/maps)
*
View
@@ -25,7 +25,7 @@
* File Name: GIAdatabase.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* Requirements: requires a GIA network created for both existing knowledge and the query (question)
* Description: performs simple GIA database functions (storing nodes in ordered arrays/vectors/maps)
*
View
@@ -25,7 +25,7 @@
* File Name: GIAdraw.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* Requirements: requires text parsed by NLP Parser (eg Relex; available in .CFF format <relations>)
* Description: Draws GIA nodes in GIA network/tree
*
View
@@ -25,7 +25,7 @@
* File Name: GIAdraw.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* Requirements: requires text parsed by NLP Parser (eg Relex; available in .CFF format <relations>)
* Description: Draws GIA nodes in GIA network/tree
*
@@ -25,7 +25,7 @@
* File Name: GIAentityConnectionClass.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
*
*******************************************************************************/
@@ -25,7 +25,7 @@
* File Name: GIAentityConnectionClass.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* NB a substance is an instance of an entity, any given entity may contain/comprise/have multiple substances - and substances are unrelated to definitions between entities [they just define what comprises any given entity]
*
*******************************************************************************/
@@ -25,7 +25,7 @@
* File Name: GIAentityNodeClass.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
*
*******************************************************************************/
@@ -292,6 +292,12 @@ GIAentityNode::GIAentityNode(void)
#ifdef GIA_NEURAL_NETWORK
parsedForANNgeneration = false;
/*
#ifdef GIA_NEURAL_NETWORK_SYMBOLIC_CORE_CONCEPT_INDEX_BITS
conceptIndexType = GIA_NEURAL_NETWORK_SYMBOLIC_CORE_CONCEPT_INDEX_BITS_TYPE_UNKNOWN;
conceptIndex = INT_DEFAULT_VALUE;
#endif
*/
#endif
}
/*
View
@@ -25,7 +25,7 @@
* File Name: GIAentityNodeClass.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 3d5f 11-August-2017
* Project Version: 3d6a 12-November-2017
* NB a substance is an instance of an entity, any given entity may contain/comprise/have multiple substances - and substances are unrelated to definitions between entities [they just define what comprises any given entity]
*
*******************************************************************************/
@@ -361,7 +361,7 @@ class GIAentityNode
/*GIA Entity Name*/
string entityName;
#ifdef GIA_WORD_ORIG
string wordOrig; //this needs to be added to XML i/o + file system database i/o [used for NLG2 bug]
string wordOrig; //this needs to be added to XML i/o + file system database i/o
#endif
double confidence; //not currently used
#ifdef GIA_ALIASES
@@ -371,7 +371,7 @@ class GIAentityNode
/*GIA Entity Type*/
int entityType;
bool isActionConcept; //added 1t5a to take into account specific actions eg 'eating pies', 'to eat a pie'
bool isActionConcept; //is applied to entityType->GIA_ENTITY_TYPE_ACTION //added 1t5a to take into account specific actions eg 'eating pies', 'to eat a pie'
bool hasAssociatedInstance; //this boolean appears to only represent whether this entity defines a child substance node [and not whether it contains one]
bool hasAssociatedTime;
bool negative; //if !GIA_ADD_ARTIFICIAL_AUXILIARY_FOR_ALL_PROPERTIES_AND_DEFINITIONS: for prepositional entities which will be collapsed into conditions only //NB relex does not appear to output this information for properties and actions
@@ -593,6 +593,12 @@ class GIAentityNode
#ifdef GIA_NEURAL_NETWORK
bool parsedForANNgeneration;
/*
#ifdef GIA_NEURAL_NETWORK_SYMBOLIC_CORE_CONCEPT_INDEX_BITS
int conceptIndexType;
int conceptIndex;
#endif
*/
#endif
};
Oops, something went wrong.

0 comments on commit fcb5ee4

Please sign in to comment.