Permalink
Browse files

Small bug fix in makeprob.cl

Finish up DataShop export for Summer 2012 Guerra class
Rerun fits to three models, comparing with constant model.
Work more on papers.
  • Loading branch information...
1 parent 96021af commit 933f3db4233631f9936108ccbc02d82c765df0fe @bvds committed Aug 22, 2012
View
@@ -168,25 +168,26 @@
"Returns a list of kc's found in all solutions and a list of kc's found in only some solutions."
;; need help system loaded to use this function.
;; run function (andes-init) first.
- (handler-case
- (read-problem-info prob)
- (error (c) (declare (ignore c))
- (format T "File read error: ~A~%" prob)))
- (when *cp*
- (let (not-all any)
- (dolist (solution (problem-solutions *cp*))
- (let (this)
- (dolist (entry (distinct-SystemEntries
- (mappend #'bgnode-entries (EqnSet-nodes solution))))
- (dolist (opinst (remove-duplicates
- (copy-list (SystemEntry-Sources entry))
- :key #'csdo-op :test #'unify))
- (let ((kc (csdo-op opinst)))
- (pushnew (car kc) any)
- (pushnew (car kc) this))))
+ (let (*cp*)
+ (handler-case
+ (read-problem-info prob)
+ (error (c) (declare (ignore c))
+ (format T "File read error: ~A~%" prob)))
+ (when *cp*
+ (let (not-all any)
+ (dolist (solution (problem-solutions *cp*))
+ (let (this)
+ (dolist (entry (distinct-SystemEntries
+ (mappend #'bgnode-entries (EqnSet-nodes solution))))
+ (dolist (opinst (remove-duplicates
+ (copy-list (SystemEntry-Sources entry))
+ :key #'csdo-op :test #'unify))
+ (let ((kc (csdo-op opinst)))
+ (pushnew (car kc) any)
+ (pushnew (car kc) this))))
(dolist (op any)
(unless (member op this) (pushnew op not-all)))))
- (cons (set-difference any not-all) not-all))))
+ (cons (set-difference any not-all) not-all)))))
;; need helpsystem loaded for this
;; (dump-entries-operators #P"/home/bvds/solutions/")
@@ -6,7 +6,7 @@ The Raj lab study is sections 'study-c' and 'study-e'
and date after 2011-04-01. The experimental conditions
are identical with the Guerra dataset above.
-UPDATE CLASS_INFORMATION name='', school='', description='',
+UPDATE CLASS_INFORMATION SET name='', school='', description='',
instructorName=''
WHERE classSection='';
@@ -40,4 +40,18 @@ experimental condition. Maybe something like:
<desc>Randomly choose help strategy.</desc>
</condition>
-*** St. Anselm class, Summer 2012
+*** St. Anselm class, Summer 2012
+
+asu_7e256268bab914fb5asul1_
+
+Experimental condition is problem-wise and must be
+applied externally.
+
+INSERT INTO STUDENT_DATASET SET datasetname='St. Anselm College, Introductory Physics, Summer 2012', modulename='Physics';
+
+SELECT * FROM STUDENT_DATASET; // to get dataset ID, use below.
+
+UPDATE CLASS_INFORMATION SET name='PS 121-122, General Physics I-II',
+ school='St. Anselm College', description='Condensed summer school version of two-semester course.',
+ instructorName='David Guerra', datasetID=6
+ WHERE classSection='asu_7e256268bab914fb5asul1_';
@@ -79,17 +79,14 @@
// Append user id into meta
$meta->appendChild($user_id);
$sessionID = $doc->createElement("session_id");
- //$user_id->setAttribute('anonFlag', "true");
$sessionID->nodeValue = $row['clientID'];
$meta->appendChild($sessionID);
// Append session_id to meta
$timerec = $doc->createElement("time");
- //$user_id->setAttribute('anonFlag', "true");
$timerec->nodeValue = $row['startTime'];
$meta->appendChild($timerec);
// Append time to meta
$timezone = $doc->createElement("time_zone");
- //$user_id->setAttribute('anonFlag', "true");
$timezone->nodeValue = 'MST';
$meta->appendChild($timezone);
//Append timezone to meta
@@ -162,6 +159,10 @@
//////
+ // This is where problems might be grouped
+ // according to sections or weeks or chapters
+ // or something.
+
//$dslevel2 = $doc->createElement("level");
//$dslevel2->setAttribute('type', "section");
//$dslevel2_name = $doc->createElement("name");
@@ -237,7 +238,6 @@
// Append user_id as a child to meta
$toolmeta->appendChild($user_id);
$sessionID = $doc->createElement("session_id");
- //$user_id->setAttribute('anonFlag', "true");
$sessionID->nodeValue = $row['clientID'];
// Append session_id as a child to meta
$toolmeta->appendChild($sessionID);
@@ -251,14 +251,12 @@
$timetrans = $params1->time;
$srttime = strtotime($row['startTime']);
$newtime = date('Y-m-d H:i:s', $srttime + $timetrans);
- //$user_id->setAttribute('anonFlag', "true");
$timerec->nodeValue = ($newtime);
// Append time as a child to meta
$toolmeta->appendChild($timerec);
}
}
$timezone = $doc->createElement("time_zone");
- //$user_id->setAttribute('anonFlag', "true");
$timezone->nodeValue = 'MST';
// Append timezone as a child to meta
$toolmeta->appendChild($timezone);
Oops, something went wrong.

0 comments on commit 933f3db

Please sign in to comment.