...
 
Commits (39)

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

No preview for this file type
*.dx64fsl
*.dx32fsl
*.ds_store
modules/Display_Scholar_sdsd/
modules/SolverOut1032531681
modules/Structure_Stochastic_asdsdsds/
*.lx32fsl
*.lx64fsl
*.wx32fsl
*.wx64fsl
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Block Num responses % Correct
0 37 75.67567567567568
1 25 68.0
2 36 91.66666666666666
3 25 72.0
0 40 55.00000000000001
1 22 50.0
2 35 94.28571428571428
3 25 80.0
0 37 70.27027027027027
1 24 62.5
2 36 94.44444444444444
3 23 95.65217391304348
0 37 72.97297297297297
1 25 76.0
2 36 88.88888888888889
3 24 79.16666666666666
0 39 69.23076923076923
1 24 79.16666666666666
2 36 88.88888888888889
3 24 79.16666666666666
0 40 60.0
1 24 79.16666666666666
2 36 88.88888888888889
3 24 79.16666666666666
0 36 80.55555555555556
1 24 62.5
2 36 94.44444444444444
3 23 95.65217391304348
0 38 68.42105263157895
1 24 62.5
2 36 88.88888888888889
3 24 66.66666666666666
0 36 80.55555555555556
1 24 62.5
2 36 94.44444444444444
3 23 95.65217391304348
0 38 68.42105263157895
1 24 62.5
2 36 88.88888888888889
3 24 66.66666666666666
0 38 73.68421052631578
1 25 72.0
2 35 91.42857142857143
3 25 80.0
0 38 68.42105263157895
1 24 62.5
2 36 88.88888888888889
3 24 66.66666666666666
0 38 73.68421052631578
1 25 72.0
2 35 91.42857142857143
3 25 80.0
0 36 80.55555555555556
1 24 66.66666666666666
2 36 88.88888888888889
3 24 87.5
0 37 78.37837837837837
1 25 64.0
2 36 88.88888888888889
3 22 72.72727272727273
0 36 80.55555555555556
1 25 64.0
2 36 97.22222222222221
3 24 83.33333333333334
0 37 72.97297297297297
1 25 72.0
2 35 91.42857142857143
3 25 80.0
0 36 80.55555555555556
1 25 64.0
2 36 88.88888888888889
3 22 72.72727272727273
0 37 72.97297297297297
1 25 72.0
2 35 91.42857142857143
3 25 80.0
0 38 76.31578947368422
1 25 84.0
2 36 94.44444444444444
3 24 75.0
0 36 80.55555555555556
1 25 68.0
2 36 88.88888888888889
3 22 77.27272727272727
0 38 76.31578947368422
1 25 84.0
2 36 94.44444444444444
3 24 75.0
0 36 80.55555555555556
1 25 68.0
2 36 88.88888888888889
3 22 77.27272727272727
0 38 76.31578947368422
1 25 84.0
2 36 94.44444444444444
3 24 75.0
0 38 78.94736842105263
1 25 72.0
2 35 97.14285714285714
3 25 72.0
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -43,6 +43,8 @@
;;; : the same (doesn't affect the matching itself).
;;; 2011.04.28 Dan
;;; : * Added some declares to quite compliation warnings.
;;; 2013.10.18 Dan
;;; : * Added a few more stats to conflict-tree-stats.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
;;; General Docs:
......@@ -83,9 +85,12 @@
;;; are valid
;;; :sets - the number of different sets of productions found at in the
;;; non-empty leaf nodes
;;; :average-set - the mean size of non-empty sets
;;; :largest-set - the size of the largest set
;;;
;;; > (conflict-tree-stats )
;;; ((:DEPTH . 24) (:MIN-DEPTH . 3) (:TOTAL-NODES . 4670) (:TERMINAL . 3422) (:NON-EMPTY . 3373) (:SETS . 1073))
;;; ((:DEPTH . 24) (:MIN-DEPTH . 3) (:TOTAL-NODES . 4670) (:TERMINAL . 3422) (:NON-EMPTY . 3373) (:SETS . 1073)
;;; (:AVERAGE-SET . 4.746098) (:LARGEST-SET . 187))
;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
......@@ -233,10 +238,14 @@
(defun conflict-tree-stats ()
(setf *tree-data* nil)
(mapcar #'cons '(:depth :min-depth :total-nodes :terminal :non-empty :sets)
(mapcar #'cons '(:depth :min-depth :total-nodes :terminal :non-empty :sets :average-set :largest-set)
(append (multiple-value-list (get-tree-stats (procedural-conflict-tree (get-module procedural))))
(list (length *tree-data*)) (list (length (remove nil *tree-data*)))
(list (length (remove-duplicates *tree-data* :test 'equalp))))))
(list (length (remove-duplicates *tree-data* :test 'equalp)))
(list (let ((nodes (remove nil *tree-data*)))
(unless (null nodes)
(* 1.0 (/ (reduce '+ (mapcar 'length nodes)) (length nodes))))))
(list (reduce 'max (mapcar 'length *tree-data*))))))
(defmethod get-tree-stats ((node binary-test-node))
(let ((max-depth 0)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#0Y_ #0Y |CHARSET|::|UTF-8|
(|COMMON-LISP|::|UNLESS|
(|COMMON-LISP|::|MEMBER| "PRODUCTION-PARSING" |COMMON-LISP|::|*MODULES*|
:|TEST| #'|COMMON-LISP|::|STRING=|)
(|COMMON-LISP-USER|::|COMPILE-AND-LOAD|
(|COMMON-LISP|::|TRANSLATE-LOGICAL-PATHNAME|
"ACT-R6:support;production-parsing-support")))
(|SYSTEM|::|REMOVE-OLD-DEFINITIONS| '|COMMON-LISP-USER|::|DEFINE-P*|)
(|SYSTEM|::|%PUTD| '|COMMON-LISP-USER|::|DEFINE-P*|
(|SYSTEM|::|MAKE-MACRO|
(|COMMON-LISP|::|FUNCTION| |COMMON-LISP-USER|::|DEFINE-P*|
(|COMMON-LISP|::|LAMBDA| (|SYSTEM|::|<MACRO-FORM>| |SYSTEM|::|<ENV-ARG>|)
(|COMMON-LISP|::|DECLARE| (|COMMON-LISP|::|CONS| |SYSTEM|::|<MACRO-FORM>|))
(|COMMON-LISP|::|DECLARE| (|COMMON-LISP|::|IGNORE| |SYSTEM|::|<ENV-ARG>|))
"Production definition."
(|COMMON-LISP|::|LET*|
((|COMMON-LISP-USER|::|DEFINITION|
(|COMMON-LISP|::|CDR| |SYSTEM|::|<MACRO-FORM>|)))
(|COMMON-LISP|::|BLOCK| |COMMON-LISP-USER|::|DEFINE-P*|
`(|COMMON-LISP-USER|::|P*-FCT| ',|COMMON-LISP-USER|::|DEFINITION|)))))
'(|COMMON-LISP|::|&REST| |COMMON-LISP-USER|::|DEFINITION|)))
(|SYSTEM|::|C-DEFUN| '|COMMON-LISP-USER|::|DEFINE-P*-FCT|
(|SYSTEM|::|LAMBDA-LIST-TO-SIGNATURE| '(|COMMON-LISP-USER|::|DEFINITION|)))
(|SYSTEM|::|REMOVE-OLD-DEFINITIONS| '|COMMON-LISP-USER|::|P*|)
(|SYSTEM|::|%PUTD| '|COMMON-LISP-USER|::|P*|
(|SYSTEM|::|MAKE-MACRO|
(|COMMON-LISP|::|FUNCTION| |COMMON-LISP-USER|::|P*|
(|COMMON-LISP|::|LAMBDA| (|SYSTEM|::|<MACRO-FORM>| |SYSTEM|::|<ENV-ARG>|)
(|COMMON-LISP|::|DECLARE| (|COMMON-LISP|::|CONS| |SYSTEM|::|<MACRO-FORM>|))
(|COMMON-LISP|::|DECLARE| (|COMMON-LISP|::|IGNORE| |SYSTEM|::|<ENV-ARG>|))
"Production definition."
(|COMMON-LISP|::|LET*|
((|COMMON-LISP-USER|::|DEFINITION|
(|COMMON-LISP|::|CDR| |SYSTEM|::|<MACRO-FORM>|)))
(|COMMON-LISP|::|BLOCK| |COMMON-LISP-USER|::|P*|
`(|COMMON-LISP-USER|::|P*-FCT| ',|COMMON-LISP-USER|::|DEFINITION|)))))
'(|COMMON-LISP|::|&REST| |COMMON-LISP-USER|::|DEFINITION|)))
(|SYSTEM|::|C-DEFUN| '|COMMON-LISP-USER|::|P*-FCT|
(|SYSTEM|::|LAMBDA-LIST-TO-SIGNATURE| '(|COMMON-LISP-USER|::|DEFINITION|)))
(|SYSTEM|::|C-DEFUN| '|COMMON-LISP-USER|::|DEFINE-VARIABLE-CHUNK-SPEC-FCT|
(|SYSTEM|::|LAMBDA-LIST-TO-SIGNATURE|
'(|COMMON-LISP-USER|::|SPECIFICATIONS-LIST|)))
(|SYSTEM|::|C-DEFUN| '|COMMON-LISP-USER|::|PROCESS-VARIABLE-SLOTS-SPECS|
(|SYSTEM|::|LAMBDA-LIST-TO-SIGNATURE|
'(|COMMON-LISP-USER|::|CHUNK-TYPE| |COMMON-LISP-USER|::|SPECS|)))
(|SYSTEM|::|C-DEFUN| '|COMMON-LISP-USER|::|VALID-VARIABLE-CHUNK-MOD-SPEC|
(|SYSTEM|::|LAMBDA-LIST-TO-SIGNATURE|
'(|COMMON-LISP-USER|::|CHUNK-TYPE|
|COMMON-LISP-USER|::|MODIFICATIONS-LIST|)))
(|SYSTEM|::|C-DEFUN| '|COMMON-LISP-USER|::|EXTEND-BUFFER-CHUNK|
(|SYSTEM|::|LAMBDA-LIST-TO-SIGNATURE|
'(|COMMON-LISP-USER|::|BUFFER-NAME| |COMMON-LISP-USER|::|MOD-LIST|)))
(|SYSTEM|::|C-DEFUN| '|COMMON-LISP-USER|::|EXTENDING-CHUNK-TYPE|
(|SYSTEM|::|LAMBDA-LIST-TO-SIGNATURE|
'(|COMMON-LISP-USER|::|CT| |COMMON-LISP-USER|::|SLOT|)))
This diff is collapsed.
This diff is collapsed.
......@@ -305,6 +305,20 @@
;;; 2011.04.28 Dan
;;; : * Added some declaims to avoid compiler warnings about
;;; : undefined functions and removed some unneeded let variables.
;;; 2013.08.05 Dan
;;; : * Clear the hashtables for the style warnings in clear-productions.
;;; 2013.08.09 Dan
;;; : * Added the command decalare-buffer-usage to avoid style
;;; : warnings when chunks are being set through code or otherwise
;;; : not in the initial model definition.
;;; 2013.08.12 Dan
;;; : * Changed declare-buffer-usage to return t/nil.
;;; 2013.10.18 Dan
;;; : * Finally fixed the typo in test-and-perfrom.
;;; 2013.11.14 Dan
;;; : * Changed declare-buffer-usage to also allow suppressing the
;;; : "modified without use" style warnings by adding the slots to
;;; : the procedural-cond-style-usage-table as well.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
;;; General Docs:
......@@ -370,6 +384,13 @@
(if prod
(progn
(print-warning "Clearing the productions is not recommended")
(clrhash (procedural-cond-style-usage-table prod))
(clrhash (procedural-req-style-usage-table prod))
(clrhash (procedural-mod-style-usage-table prod))
(clrhash (procedural-retrieval-cond-style-usage-table prod))
(clrhash (procedural-retrieval-req-style-usage-table prod))
(dolist (p (productions-list prod))
(remove-production p prod)))
(print-warning "No procedural module was found."))))
......@@ -543,10 +564,10 @@
(unless (production-disabled production)
(when (and (conflict-tests procedural (production-constants production) production 'test-constant-condition :report nil)
(conflict-tests procedural (production-binds production) production 'test-and-perfrom-bindings :report nil)
(conflict-tests procedural (production-binds production) production 'test-and-perform-bindings :report nil)
(conflict-tests procedural (production-others production) production 'test-other-condition :report nil)
(conflict-tests procedural (production-searches production) production 'test-search-buffers :report nil)
(conflict-tests procedural (production-search-binds production) production 'test-and-perfrom-bindings :report nil)
(conflict-tests procedural (production-search-binds production) production 'test-and-perform-bindings :report nil)
(conflict-tests procedural (production-search-others production) production 'test-other-condition :report nil)
)
......@@ -600,8 +621,39 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; A command to avoid style warnings.
(defmacro declare-buffer-usage (buffer type &rest slots)
`(declare-buffer-usage-fct ',buffer ',type ',slots))
(defun declare-buffer-usage-fct (buffer type &optional slots)
(let ((procedural (get-module procedural)))
(if procedural
(cond ((not (find buffer (buffers)))
(print-warning "Cannot declare usage for ~S because it does not name a buffer in the model." buffer))
((not (chunk-type-p-fct type))
(print-warning "Cannot declare usage for buffer ~s because ~s does not name a chunk-type in the model." buffer type))
((not (or (eq slots :all)
(and (listp slots) (= (length slots) 1) (eq (car slots) :all))
(every (lambda (x)
(possible-chunk-type-slot type x))
slots)))
(print-warning "Cannot declare usage for buffer ~s because the slots (~{~s~^ ~}) are not valid for chunk-type ~s."
buffer (remove-if (lambda (x)
(possible-chunk-type-slot type x))
slots)
type))
(t
(when (or (eq slots :all)
(and (listp slots) (= (length slots) 1) (eq (car slots) :all)))
(setf slots (chunk-type-possible-slot-names-fct type)))