Update: numeric term handling complete. precondition matters here, no…

…t op and index considerations
opennars · Dec 10, 2023 · dfa75f3 · dfa75f3
1 parent a75d16f
commit dfa75f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/Config.h b/src/Config.h
@@ -87,7 +87,7 @@
 //If var intro should be allowed at all (includes sensorimotor!)
 #define ALLOW_VAR_INTRO true
 //Numeric term similarity distance scale (everything beyound distance leads to conf 0 analogy!)
-#define SIMILARITY_DISTANCE 0.3
+#define SIMILARITY_DISTANCE 1.0
 
 /*---------------------------------*/
 /* Temporal compounding parameters */

diff --git a/src/Decision.c b/src/Decision.c
@@ -323,17 +323,14 @@ Decision Decision_BestCandidate(Concept *goalconcept, Event *goal, long currentT
  {
  for(int k=0; k<goalconcept->precondition_beliefs[opk].itemsAmount; k++)
  {
- if(!(opi == opk && k == j))
+ Implication impk = goalconcept->precondition_beliefs[opk].array[k];
+ Term left_side_with_opk = Term_ExtractSubterm(&impk.term, 1);
+ Term left_sidek = Narsese_GetPreconditionWithoutOp(&left_side_with_opk);
+ Substitution subs3 = Variable_UnifyWithAnalogy(cmatch->belief_spike.truth, &left_sidek, &cmatch->term);
+ if(subs3.success && subs3.truth.confidence > subs2.truth.confidence)
  {
- Implication impk = goalconcept->precondition_beliefs[opk].array[k];
- Term left_side_with_opk = Term_ExtractSubterm(&impk.term, 1);
- Term left_sidek = Narsese_GetPreconditionWithoutOp(&left_side_with_opk);
- Substitution subs3 = Variable_UnifyWithAnalogy(cmatch->belief_spike.truth, &left_sidek, &cmatch->term);
- if(subs3.success && subs3.truth.confidence > subs2.truth.confidence)
- {
- hasCloserPreconditionLink = true;
- break;
- }
+ hasCloserPreconditionLink = true;
+ break;
  }
  }
  if(hasCloserPreconditionLink)