Skip to content

Commit

Permalink
rename path references for Problems directory
Browse files Browse the repository at this point in the history
  • Loading branch information
Brett van de Sande committed Jan 9, 2009
1 parent 0b38122 commit 693139e
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Documentation/AndesScriptUserManual1.html
Expand Up @@ -1121,7 +1121,7 @@ <h2>
C:/Andes2/KB/Newtons2.cl&nbsp; -- this is all the operator definitions</li>

<li>
C:/Andes2/KB/Problems.cl -- all the problem definitions</li>
C:/Andes2/problems -- all the problem definitions</li>
</ul>
The ontology.cl file isn't ready yet.&nbsp; It only has a few uninteresting
definitions in it.
Expand Down
2 changes: 1 addition & 1 deletion Help/State.cl
Expand Up @@ -251,7 +251,7 @@
;; Load the current problem and set into global *cp*
;; NB: for case-sensitive filesystems, ensure we convert the problem name,
;; passed as a string, to canonical upper case used for problem ids.
(setf *cp* (read-problem-file (string-upcase name) :path (andes-path "Problems/")))
(setf *cp* (read-problem-file (string-upcase name) :path (andes-path "solutions/")))

;; If the problem failed to load then we will submit a color-red turn
;; to the workbench in order to make the case known. If not then the
Expand Down
20 changes: 10 additions & 10 deletions KB/kgraph.nb
Expand Up @@ -115,11 +115,11 @@ Cell[BoxData[
Cell[CellGroupData[{

Cell[BoxData[
\(Export["\<~/Andes2/Problems/kgraph5b.gif\>", aa,
\(Export["\<~/Andes2/solutions/kgraph5b.gif\>", aa,
ImageSize \[Rule] 6*72]\)], "Input"],

Cell[BoxData[
\("~/Andes2/Problems/kgraph5b.gif"\)], "Output"]
\("~/Andes2/solutions/kgraph5b.gif"\)], "Output"]
}, Open ]]
}, Closed]],

Expand Down Expand Up @@ -184,11 +184,11 @@ Cell[BoxData[
Cell[CellGroupData[{

Cell[BoxData[
\(Export["\<~/Andes2/Problems/kgraph5c.gif\>", aa,
\(Export["\<~/Andes2/solutions/kgraph5c.gif\>", aa,
ImageSize \[Rule] 6*72]\)], "Input"],

Cell[BoxData[
\("~/Andes2/Problems/kgraph5c.gif"\)], "Output"]
\("~/Andes2/solutions/kgraph5c.gif"\)], "Output"]
}, Open ]]
}, Closed]],

Expand Down Expand Up @@ -253,11 +253,11 @@ Cell[BoxData[
Cell[CellGroupData[{

Cell[BoxData[
\(Export["\<~/Andes2/Problems/kgraph5d.gif\>", aa,
\(Export["\<~/Andes2/solutions/kgraph5d.gif\>", aa,
ImageSize \[Rule] 6*72]\)], "Input"],

Cell[BoxData[
\("~/Andes2/Problems/kgraph5d.gif"\)], "Output"]
\("~/Andes2/solutions/kgraph5d.gif"\)], "Output"]
}, Open ]]
}, Closed]],

Expand Down Expand Up @@ -323,11 +323,11 @@ Cell[BoxData[
Cell[CellGroupData[{

Cell[BoxData[
\(Export["\<~/Andes2/Problems/kgraph5e.gif\>", aa,
\(Export["\<~/Andes2/solutions/kgraph5e.gif\>", aa,
ImageSize \[Rule] 6*72]\)], "Input"],

Cell[BoxData[
\("~/Andes2/Problems/kgraph5e.gif"\)], "Output"]
\("~/Andes2/solutions/kgraph5e.gif"\)], "Output"]
}, Open ]]
}, Closed]],

Expand Down Expand Up @@ -391,11 +391,11 @@ Cell[BoxData[
Cell[CellGroupData[{

Cell[BoxData[
\(Export["\<~/Andes2/Problems/kgraph8b.gif\>", aa,
\(Export["\<~/Andes2/solutions/kgraph8b.gif\>", aa,
ImageSize \[Rule] 6*72]\)], "Input"],

Cell[BoxData[
\("~/Andes2/Problems/kgraph8b.gif"\)], "Output"]
\("~/Andes2/solutions/kgraph8b.gif"\)], "Output"]
}, Open ]]
}, Closed]]
},
Expand Down
6 changes: 3 additions & 3 deletions KB/makeprob.cl
Expand Up @@ -74,7 +74,7 @@
(pprint Errs)))

;;; compare prb files in two directories
;;; (diff-prbs (Default-ProblemFile-Path) #P"/home/bvds/Andes2-old/Problems/" '(lmom1a lmom1b))
;;; (diff-prbs (Default-ProblemFile-Path) #P"/home/bvds/Andes2-old/solutions/" '(lmom1a lmom1b))
(defun diff-prbs (path1 path2 &rest topics)
"compare prb files in two directories."
(let (Errs)
Expand All @@ -98,7 +98,7 @@


;; need helpsystem loaded for this
;; (dump-html-prbs #P"/home/bvds/Andes2/Problems/" #P"/home/bvds/solutions/")
;; (dump-html-prbs #P"/home/bvds/Andes2/solutions/" #P"/home/bvds/solutions/")
;; scp -r ~/solutions/ andes3.lrdc.pitt.edu:/home/andes/public_html/learnlab

(defun dump-html-prbs (in-path out-path &rest topics)
Expand All @@ -113,7 +113,7 @@
(dump-style-file out-path))

;; need helpsystem loaded for this
;; (dump-entries-operators #P"/home/bvds/Andes2/Problems/" #P"/home/bvds/solutions/")
;; (dump-entries-operators #P"/home/bvds/Andes2/solutions/" #P"/home/bvds/solutions/")
;; scp -r ~/solutions/ andes3.lrdc.pitt.edu:/home/andes/public_html/learnlab
(defun dump-entries-operators (in-path out-path &rest topics)
"write operators and entries to working problems into a directory"
Expand Down
8 changes: 4 additions & 4 deletions KB/principles.cl
Expand Up @@ -434,9 +434,9 @@
;;; List of Andes distribution homework sets
;;;
;; This list was generated by applying the following perl script
;; to Problems/*.aps & Problems/index.html.
;; to solutions/*.aps & solutions/index.html.
;;
;; cd Problems; perl -w -n -e 'if(m/"(.*?\.aps)">(.*?)</){open F,"< $1" or next;my @y=<F>;close F;shift @y;shift @y;chomp(@y);print "(\"$2\" (@y))\n";}' Problems/index.html
;; cd solutions; perl -w -n -e 'if(m/"(.*?\.aps)">(.*?)</){open F,"< $1" or next;my @y=<F>;close F;shift @y;shift @y;chomp(@y);print "(\"$2\" (@y))\n";}' solutions/index.html
;;
(setf *sets* '(("Vectors" (vec1a vec1b vec1c vec1d vec1e vec1f vec2a vec2b vec2c vec2d vec2e vec2f vec3a vec3b-DEMO.wmv vec3b vec3c vec3d vec4a vec4b vec4c vec4d vec5a vec5b vec5c vec5d vec6a vec6b vec6c vec6d vec7a vec8a vec8b vec8c vec9 relvel1a-DEMO.wmv relvel1a relvel2a relvel3a mot1 mot2 mot3 mot4 vec20 vec21 ))
("Kinematics Graphs" (kgraph2 kgraph3 kgraph4 kgraph5 kgraph5b kgraph5c kgraph5d kgraph5e kgraph5f kgraph6 kgraph7 kgraph8 kgraph8b kgraph8c kgraph8d kgraph8e kgraph8f kgraph8g kgraph9 kgraph9b kgraph10 kgraph10b kgraph11 kgraph12 kgraph13 kgraph14 kgraph16 kgraph17 kgraph18 kgraph19 kgraph20 kgraph21 kgraph22 kgraph30 kgraph31 ))
Expand Down Expand Up @@ -1156,8 +1156,8 @@
;; Use the above perl script to fix the math formatting after the files
;; are generated.
;; (problem-html-files #P"/Users/bvds/problems/")
;; cp Problems/*.gif ~/problems/
;; cp Problems/*.jpg ~/problems/
;; cp solutions/*.gif ~/problems/
;; cp solutions/*.jpg ~/problems/

(defun problem-html-files (&optional (path *andes-path*))
"construct html files for all problems"
Expand Down
2 changes: 1 addition & 1 deletion Knowledge/Problem.cl
Expand Up @@ -17,7 +17,7 @@

(defun Default-ProblemFile-Path ()
;; trailing / makes it a directory
(merge-pathnames "Problems/" *Andes-Path*))
(merge-pathnames "solutions/" *Andes-Path*))

(defparameter *Number-Of-Problems* 0
"The number of problems registered to the system.")
Expand Down
4 changes: 2 additions & 2 deletions diff-prbs.cl
@@ -1,9 +1,9 @@
;;; sbcl < diff-prbs.cl >& diff-prbs.log &
;;;
;;; (print-problem-solutions (read-problem-file (string 'kt1a) :Path #P"/home/bvds/Andes2-old/Problems/"))
;;; (print-problem-solutions (read-problem-file (string 'kt1a) :Path #P"/home/bvds/Andes2-old/solutions/"))
;;;
(rkb)
(defvar t0 (get-internal-run-time))
(diff-prbs (Default-ProblemFile-Path) #P"/home/bvds/Andes2-old/Problems/")
(diff-prbs (Default-ProblemFile-Path) #P"/home/bvds/Andes2-old/solutions/")
(/ (- (get-internal-run-time) t0) internal-time-units-per-second)
(quit)
2 changes: 1 addition & 1 deletion make-prbs.cl
@@ -1,6 +1,6 @@
;;; script for regenerating all problem files
;;; grep minutes make-prbs.log | sort -g -k7
;;; ls Problems/*.prb | sed "s/Problems\/\(.*\).prb/\1/"
;;; ls solutions/*.prb | sed "s/solutions\/\(.*\).prb/\1/"
;;; sbcl < make-prbs.cl >& make-prbs.log &
(rkb)
(defvar t0 (get-internal-run-time))
Expand Down
8 changes: 4 additions & 4 deletions KB/waves-problems.nb → problems/waves-problems.nb
Expand Up @@ -305,10 +305,10 @@ Cell[BoxData[
Cell[CellGroupData[{

Cell[BoxData[
\(Export["\<../Problems/wave6.gif\>", pp]\)], "Input"],
\(Export["\<../solutions/wave6.gif\>", pp]\)], "Input"],

Cell[BoxData[
\("../Problems/wave6.gif"\)], "Output"]
\("../solutions/wave6.gif"\)], "Output"]
}, Open ]],

Cell["\<\
Expand Down Expand Up @@ -1320,11 +1320,11 @@ Cell[BoxData[
Cell[CellGroupData[{

Cell[BoxData[
\(Export["\<Andes2/Problems/wave24.gif\>", pp24,
\(Export["\<Andes2/solutions/wave24.gif\>", pp24,
ImageSize \[Rule] 400]\)], "Input"],

Cell[BoxData[
\("Andes2/Problems/wave24.gif"\)], "Output"]
\("Andes2/solutions/wave24.gif"\)], "Output"]
}, Open ]]
},
FrontEndVersion->"5.2 for Macintosh",
Expand Down

0 comments on commit 693139e

Please sign in to comment.