Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xiang branch #50

Open
wants to merge 206 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
13c6981
Open-NARS distribution with examples
Jul 24, 2008
c30d093
fix a bug in EquivalenceAfter.java and two other classes, and allow c…
Jul 31, 2008
addfa2e
updated jar and javadoc
Jul 31, 2008
8597410
Fix a bug that produces "Wrong value" message
Aug 12, 2008
ed3d2a3
Jan 18, 2009
2f65c2a
Open-nars 1.1.2. Minor bugs fixed.
Jan 18, 2009
2ff3479
Open-nars 1.1.3 source code. The design of temporal inference has bee…
Aug 15, 2009
b81e39b
Open-nars distribution files: JAR, javadoc, and examples
Aug 15, 2009
9ce1332
New version renamed to 1.2.0, with some modifications
Aug 15, 2009
c511d17
Open-nars 1.2.0 JAR file
Aug 15, 2009
a161fc8
A few changes by Pei and Jeff
Aug 29, 2009
521c85d
In startPlay, check if the window already exists before creating a ne…
Aug 29, 2009
0f8c822
Revert change to startPlay to allow multiple instances of the window …
Aug 29, 2009
2c57085
Added button "Play in New Window".
Aug 29, 2009
69fdace
In structuralDecompose2, check for null return from Statement.make.
Aug 30, 2009
87aaff9
fix several bugs found by Jeff
Aug 31, 2009
66636c1
Handle event windowClosing so that the close button on the window works.
Sep 1, 2009
8be970c
In startPlay, if there is already a ConceptWindow, call detachFromCon…
Sep 1, 2009
244134f
Add a return to putIn and putBack in storage.Bag (fix Issue 5)
Sep 4, 2009
e761ad1
In nars.inference.CompositionalRules.introVarDep, do nothing if the t…
Sep 4, 2009
473dee0
Add restriction to analogy in compounds (Issue 1)
Sep 5, 2009
5679c35
In variable substitution, consider the communitativity of CompoundTer…
Sep 5, 2009
1060b23
Make InvalidInputException and parseTerm public so they can be used b…
Sep 7, 2009
1c317b5
When the Show button is clicked, use StringParser.parseTerm so the us…
Sep 7, 2009
b49683b
Added a type checking condition for the casting in RuleTables.detachm…
Sep 11, 2009
6648047
Add null truth-value checking in decomposeCompound [Issue 8]
Sep 11, 2009
682178d
Pass the "structural" flag to revision conclusions [Issue 11], plus f…
Sep 11, 2009
1d42312
Add function to InferenceWindow: the display stops at the next occurr…
Sep 11, 2009
ba27935
Change parameters to speed up testing
Sep 11, 2009
0a60f38
Confidence 1.0000 will be automatically changed into 0.9999
Sep 13, 2009
9f363d5
Change Judgment to take (possibly null) premises in order to display …
Sep 13, 2009
b456743
Add "instanceof" checking before casting. [Issue 12]
Sep 13, 2009
4c6245c
Fix bug: In convertedJudgment, the premise is Memory.currentBelief, n…
Sep 14, 2009
089e9b2
Variable.unify must always works on cloned task or belief. [Issue 16]
Sep 18, 2009
e74a0dc
Conclusions from single-premise rules get the correct creationTime. […
Sep 18, 2009
2991012
New function: directly express negative judgments as negations
Sep 19, 2009
9932909
New function: add a "correlation discount" to the confidence of the c…
Sep 19, 2009
49cc619
Confidence discount added to inference.StructuralRules
Sep 19, 2009
da52f7d
Fixed the bug in the revision function which implicitly assumes NEAR_…
Sep 24, 2009
f0337bd
Decrease the contribution of analytical truths to empirical judgments…
Oct 11, 2009
e35286f
For the ConceptWindow, in addition to "present" belief, show "perfect…
Oct 11, 2009
e36f151
Open-nars 1.3.0. Major changes: (1) tense-related inference, (2) theo…
Jan 11, 2010
0357156
Open-nars 1.3.0. distribution files: jar, javadoc, examples
Jan 11, 2010
35d0366
open-nars 1.3.1
Apr 2, 2010
23738d9
open-nars 1.3.1, with new operators for testing
Apr 2, 2010
7117c42
new operators for testing
Apr 2, 2010
e368adc
fix a bug in conversion with query variable [Issue 20]
Apr 2, 2010
1d40a24
With a bug fixed [Issue 20]
Apr 2, 2010
994621a
open-nars 1.3.2, with several bugs fixed
May 16, 2010
dc2e898
open-nars 1.3.2 distribution files
May 16, 2010
7aaa16f
remove doc files
May 16, 2010
c7d4715
code for open-nars 1.3.3
Jun 10, 2010
b7c7d97
open-nars 1.3.3: change in display format of operations and real-time…
Jun 10, 2010
e89c397
open-nars 1.4.0. See http://code.google.com/p/open-nars/wiki/OpenNars…
Aug 23, 2010
42fd3a4
open-nars 1.5.0 distribution
Jan 21, 2013
a55dfd2
open-nars 1.5.0 source code
Jan 21, 2013
2002b78
open-nars 1.5.0 source code, with package names changed back
Jan 21, 2013
4287221
1.5.0
Jan 21, 2013
b237520
open-nars 1.5.0 fixed
Jan 22, 2013
607e22f
version 1.5.0 jar update
Jan 26, 2013
d08676f
FEATURE: read a NARS input file from the command line arguments.
Jan 29, 2013
25d4218
- removed all yellow warnings in Eclipse IDE for Java ( Version: Juno…
Jan 29, 2013
96f17a9
- added a simple build script for Linux : build.sh
Feb 2, 2013
e4c9892
add README.txt , build.bat
Feb 3, 2013
8f0b8c2
Examples and Documents of 1.5.1
Feb 4, 2013
337d9a3
1.5.1 source code
Feb 5, 2013
e57728e
rename 3 constants MAXMUM* to MAXIMUM*
Feb 6, 2013
5bc121c
A few bugs are fixed.
Feb 7, 2013
1a5f48e
New JAR file and multi-step examples.
Feb 7, 2013
5736c66
New multi-step examples.
Feb 7, 2013
9e933c7
- FIX : application did not take new input after a syntax error (in f…
Feb 9, 2013
4143f15
Added main_nogui/NARSBatch.java
Feb 10, 2013
75ce02f
- add a JUnit 4 test, TestReasoning, that currently does not pass bec…
Feb 11, 2013
8341f93
Added a main() in TestReasoning() , because in Netbeans 7.2.1 I coul…
Feb 11, 2013
ee88be3
moving TestReasoning.java to a new directory, nars_core, having Maven…
Feb 13, 2013
4670ce1
To fix bugs found by rszeno and Vanel
Feb 14, 2013
e28f4d2
new JAR with bug fixed
Feb 14, 2013
ff05f7c
Test suite now passes ( slightly changed reference results Example-NA…
Feb 14, 2013
70e86de
add 2 test files: bugfix_equivalence_conjunction-in.txt, bugfix_inher…
Feb 15, 2013
6f7fc18
update README.txt
Feb 15, 2013
2175252
Added "Dump Last State" feature in NARSBatch
Feb 16, 2013
a20c0d8
more detailed dump of the last state in NARS batch program
Feb 17, 2013
ccfd6a0
fixed a casting exception
Feb 18, 2013
a8f1715
- fix NARSBatch for TestReasoning
Feb 18, 2013
15f9838
Should fix GUI freeze that occurs now and then: use SwingUtilities.in…
Feb 24, 2013
1bcb026
First Draft of NARS translated in Scala in nars_core/
Mar 3, 2013
d1abaa7
nars_core in Scala : FIX most severe compilation problems
Mar 4, 2013
d0c757d
nars_core / Scala : everything compiles ; now debugging ( using Bag.j…
Mar 4, 2013
a80ff10
nars_core / Scala : now GUI runs without exception, but empty result;
Mar 5, 2013
bb93b51
test suite had a bad path to test dir. ( test suite failing with NPE's )
Mar 5, 2013
6f6fcb7
- add remaining translated sources Bag.scala , TestReasoning.scala
Mar 6, 2013
06cd559
- in Statement.java , CompoundTerm.java , move the default constructo…
Mar 6, 2013
f1f16ea
refactor : extract class ReasonerBatch.java out of Reasoner
Mar 6, 2013
803880c
refactor : move class ReasonerBatch.java to package main_nogui
Mar 6, 2013
6960ff5
refactor : move class Parameters.java to package main_nogui
Mar 6, 2013
2d6da33
attempt to fix the batch program (have to work on the timer) ...
Mar 7, 2013
7685ca7
Separe GUI from reasoning : most thing work in Java
Mar 7, 2013
228b402
update comments and 1 innocent change in Memoey.report()
Mar 9, 2013
4c675a6
- reestablish task stamps in Inference Log as in release 1.3.3 ( {x :…
Mar 10, 2013
7c01733
The "Play" and "Stop" button labels are misleading, as a verb suggest…
Mar 10, 2013
17fb374
REFACTOR : extract interface IInferenceRecorder;
Mar 10, 2013
3397ed3
In comments, sketch simple observer design pattern for BagWindow and …
Mar 11, 2013
e99df3a
simple observer design pattern for BagWindow and ConceptWindow
Mar 14, 2013
70ec7b8
Separe GUI from reasoning : followup :
Mar 14, 2013
d1de9f4
Separe GUI from reasoning : followup :
Mar 14, 2013
3e22715
Separe GUI from reasoning : finished
Mar 15, 2013
c566b8f
separation of GUI from reasoning: move field standAlone to NARSBatch.
Mar 17, 2013
a6829d5
Copy nars/main/* into nars_gui/src/main/java/
Mar 17, 2013
c5bbf87
Copy nars/gui/* and nars/gui/main/* into nars_gui/src/main/java/
Mar 17, 2013
bfaca16
Copy entity/* into nars_core_java/src/main/java/
Mar 17, 2013
c40f1c1
Copy inference/* into nars_core_java/src/main/java/
Mar 17, 2013
d14c12b
Copy io/* into nars_core_java/src/main/java/
Mar 17, 2013
7bb2197
Copy language/* into nars_core_java/src/main/java/
Mar 17, 2013
f7eedce
Copy storage/* into nars_core_java/src/main/java/
Mar 17, 2013
e10c7f8
Copy overview.html into nars_core_java/src/main/java/
Mar 17, 2013
4ce2b61
in nars_gui/ : migration from AWT to Swing:
Mar 17, 2013
9921fe9
Copy main_nogui/* into nars_core_java/src/main/java/
Mar 17, 2013
801ab1b
fix menu callbacks in main window
Mar 17, 2013
b226fb1
- update wiki/FAQ.wiki
Mar 18, 2013
1fe467a
- FIX: the field for clock was squeezed (just enlarged the main windo…
Mar 18, 2013
d448b82
- add MultiStepExamples-in.txt to test suite
Mar 22, 2013
251774c
FIX test suite: bugfix_inherit_negation-in.txt did not begin with *,
Mar 26, 2013
fde2793
FIX a ClassCastException when an Equivalence was cast to an implicati…
Mar 26, 2013
354e3b2
Cleaning comments
Mar 27, 2013
ecc5955
add JScrollPane in InputWindow
Mar 27, 2013
8ff7eae
snapshot for NARS.jar 1.5.2
Mar 27, 2013
d9322cc
- scroll was missing in InferenceWindow
Mar 27, 2013
0992e47
- update build.bat
Mar 28, 2013
bb51fd2
pattern_matching1 regression: found a simpler case running with NARS …
Mar 28, 2013
bfbe6c0
- update the slider to the correct value when app. has been started with
Mar 29, 2013
63b3b66
- add in nars-dist/tests : unit tests for nal1, nal2, nal4
Apr 1, 2013
cc78589
- add unit tests in nars-dist/tests/nal6:
Apr 2, 2013
94b5b7a
nal6 unit tests : work in progress
Apr 2, 2013
a5c67e1
- popup window in the case of faulty line in the input window.
Apr 4, 2013
6283087
- FIX build.bat and build.sh after adding one more package level
Apr 6, 2013
4b2a8aa
- FIX NPE when hitting the close button on the 'buffered tasks' windo…
Apr 8, 2013
6033103
bugs fixed for 1.5.4
May 5, 2013
b6b81c7
1.5.4 with tested examples
May 5, 2013
dad8005
remove old examples
May 5, 2013
dcdbfbd
1.5.4 GUI
May 5, 2013
9e685bf
FIX GUI bug: the menu item "View/Input Window" in MainWindow did not …
May 5, 2013
f04f3c3
fix bugs in the AWT to Swing conversion
Jun 23, 2013
0d9bbc9
FIX : The JScrollBar in BagWindow (used to adjust display threshold) …
Jun 30, 2013
3b7e838
- revised code for NARS 1.5.4 (on behalf of Pei Wang)
Jul 3, 2013
ebdd830
- examples updated ( on behalf of Pei Wang ) in nars-dist/Examples
Jul 16, 2013
ee29333
Javadoc comments update, mostly concerning GUI separation
Jul 16, 2013
65be534
update the HTML doc within the code, README.txt
Jul 16, 2013
0318f83
BagWindow: replace GridBagLayout with BorderLayout
Jul 16, 2013
f74f420
Try to fix this:
Jul 16, 2013
37a9f98
- make generics more type safe ( Bag, BagObserver, ... )
Jul 18, 2013
e0dbb1a
FIX nasty bug: most outputs were gone
Jul 18, 2013
47b29e9
nars-dist/NARS.jar is now in synch with release 1.5.5 .
Jul 18, 2013
749bfbc
fix version number while testing subversion
Aug 31, 2013
dd56746
(1) remove the applet code, (2) adjust the windows location, (3) rena…
Dec 17, 2013
9f4fd23
Bag String Performance Optimization SeH found and he wanted me to add.
patham9 Feb 26, 2019
51214f2
CLRF Bullshit.
patham9 Feb 26, 2019
fbd3964
Bug fix for Issue 26
pei2nars Feb 26, 2019
c4e14bc
allow relations to be reflexive, resolve Issue 38
pei2nars Feb 26, 2019
0bc2c25
allow relations to be reflexive, resolve Issue 38
pei2nars Feb 26, 2019
b8a7840
allow relations to be reflexive, resolve Issue 38
pei2nars Feb 26, 2019
f6eff07
re-commit the change in CompoundTerm.compareTo
pei2nars Feb 26, 2019
e89618a
bug fix that avoids certain exceptions
pei2nars Feb 26, 2019
554719f
New inference rules are implemented to resolve Issue 36
pei2nars Feb 26, 2019
0213df5
New inference rules and bug fixes for Issue 31 (patham9 change: witho…
pei2nars Feb 26, 2019
7ef7981
New inference rules and bug fixes for Issue 29
pei2nars Feb 26, 2019
ddaefe0
Bug fixes for Issue 29; Do not allow premises with identical evidenti…
pei2nars Feb 26, 2019
6b4fea3
modify windows position for Mac
pei2nars Feb 26, 2019
c2f7ade
inference changed to resolve Issue 30
pei2nars Feb 26, 2019
d99be84
bugs fixed to resolve Issue 32
pei2nars Feb 26, 2019
d2284c8
new inference rule to resolve Issue 35
pei2nars Feb 26, 2019
dfb905a
New rules implemented to resolve Issue 34
pei2nars Feb 26, 2019
85041bd
New rules implemented to resolve Issue 37
pei2nars Feb 26, 2019
3cfd23a
Change Bag structure from an "ArrayList of ArrayLists" to an "ArrayLi…
pei2nars Feb 26, 2019
d234819
Add inference to answer conjunctive questions containing query variab…
pei2nars Feb 26, 2019
8889dde
minor clean-ups
pei2nars Feb 26, 2019
af91e9b
finalize version 1.5.6 (patham9 change: without Parameters.java)
pei2nars Feb 26, 2019
dce1847
finalize version 1.5.6
pei2nars Feb 26, 2019
1ee352b
Revised distribution files of version 1.5.6
pei2nars Feb 26, 2019
b21053e
Fix a bug in a new inference rule
pei2nars Feb 26, 2019
57993b1
fix a bug tat causes Issue 41
pei2nars Feb 26, 2019
d295f0e
Resolve Issue 43 and the related issues in variable unification (path…
pei2nars Feb 26, 2019
4d3a1df
Solving Issue 27 with random shuffle of components
pei2nars Feb 26, 2019
9a6ae22
minor comment fix, adjusting version number to 1.5.7, removal of a un…
patham9 Feb 26, 2019
1c4dad7
fix for issue40 - Missing variable introduction rule (patham9 change:…
patham9 Feb 26, 2019
91cb594
License headers updated to MIT.
patham9 Feb 26, 2019
8fc2d57
git ignore dist, project props updated.
patham9 Feb 26, 2019
614c2db
Check if set component worked.
patham9 Feb 26, 2019
4af0afe
A shell for the retro OpenNARS :)
patham9 Feb 26, 2019
ae53c5f
Shell info added and volume control option.
patham9 Feb 26, 2019
0f64c75
Removal of scala implementation.
patham9 Feb 26, 2019
b63022c
Update README.txt
patham9 Feb 27, 2019
ae3ae67
Update README.txt
patham9 Feb 27, 2019
9ee67e7
Update README.txt
patham9 Feb 27, 2019
713bd69
Update README.txt
patham9 Feb 27, 2019
e638e3e
Update README.txt
patham9 Feb 27, 2019
31c71e3
Readme as markdown.
patham9 Feb 26, 2019
2e2e8d8
Update README.md
patham9 Feb 27, 2019
eb5ef25
Update README.md
patham9 Feb 27, 2019
5f60f31
Update README.md
patham9 Feb 27, 2019
31d1caf
Update README.md
patham9 Feb 27, 2019
8509d01
Update README.md
patham9 Feb 27, 2019
759a3e4
Update: build.sh: Explanation to run Shell added
patham9 Jul 4, 2020
b0e0358
Update: Better call this version v1.5.8
patham9 Jul 4, 2020
ca4c35a
Update: Better call this version v1.5.8
patham9 Jul 4, 2020
6caac4e
update: just to have it in a branch
patham9 Sep 3, 2020
e28c809
update: just to have it in a branch
patham9 Sep 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
In nars.inference.CompositionalRules.introVarDep, do nothing if the t…
…wo premises contain the same statement (Issue 6).
  • Loading branch information
NARS.Wang authored and NARS.Wang committed Sep 4, 2009
commit e761ad1db3c2cbe457e9fdf54f578743338d69b5
3 changes: 3 additions & 0 deletions nars/inference/CompositionalRules.java
Original file line number Diff line number Diff line change
@@ -278,6 +278,9 @@ static void decomposeStatement(CompoundTerm compound, Term component, boolean co
* @param index The location of the shared term: 0 for subject, 1 for predicate
*/
private static Conjunction introVarDep(Statement premise1, Statement premise2, int index) {
if (premise1.equals(premise2)) {
return null;
}
Statement state1, state2;
Variable var1 = new Variable(Symbols.VARIABLE_TAG + "0()");
Variable var2 = new Variable(Symbols.VARIABLE_TAG + "0()");