Commit c2762ea9 authored by Carsten Eie Frigaard's avatar Carsten Eie Frigaard
Browse files

update

parent 4f5fb551
......@@ -6,3 +6,4 @@ __pycache__
Old
Html
Etc/CourseBuilder/Demos
......@@ -922,9 +922,6 @@ til at komme igennem alle grundliggende koncepter i \i{§ 2}.}
\subitem*{Supergruppe [SG] resume af \i{§ 2 End-to-End}, ca. 30 til 45 min.}
\item{Almindelig forelæsning}
\subitem*{ekstra materiale: \link**{[HOME]/L03/Extra/k-fold_demo.ipynb}}
\item{\b{Opgave} (pipelines): \link**{[HOME]/L03/pipelines.ipynb}}
\subitem*{Data til pipelines opgaven (bør lige i L03/Data/): \link**{[HOME]/L03/Data/itmal_l01_data.pkl}}
\subitem*{(Du har allerede denne data-fil, hvis du pull'er fra [GITMAL])}
}
\sub{Slides}
......@@ -1054,7 +1051,10 @@ afleveringen.}
\enumerate{
\item{Almindelig forelæsning}
\item{\b{Opgave} (dataanalyse): \link**{[HOME]/L054/dataanalyse.ipynb}}
\item{\b{Opgave} (pipelines): \link**{[HOME]/L05/pipelines.ipynb}}
\subitem*{Data til pipelines opgaven (bør lige i L05/Data/): \link**{[HOME]/L05/Data/itmal_l01_data.pkl}}
\subitem*{(Du har allerede denne data-fil, hvis du pull'er fra [GITMAL])}
\item{\b{Opgave} (dataanalyse): \link**{[HOME]/L05/dataanalyse.ipynb}}
}
\sub{Slides}
......
......@@ -9,7 +9,7 @@ COURSEFILES = ITMAL_E21
MKDIFF=printf "DIFF Ref/%-10s Test/ .. " $1 && colordiff -dw Refs/$1 Test/ && echo "DIFF OK" && rm Test/$1
build:
@ $(PYCOURSE) -c $(COURSEFILES)/course.tex -v -o ../../Html/
@ $(PYCOURSE) -c $(COURSEFILES)/course.tex -v -o ../../Html/ -t
@ $(PYPLAN) -p $(COURSEFILES)/plan.txt -v -o ../../Html/plan.html
@ cd ../.. && $(PWD)/$(PYFILETREE) -v -o Html/filetree.html
......
......@@ -97,12 +97,13 @@ def UrlQuote(s):
assert t.find(" ") < 0
return t
def MkHtmlPage(htmlcontent):
def MkHtmlPage(htmlcontent, addexpiremetas=False):
assert Str(htmlcontent).find("DOCTYPE")<0 and htmlcontent.find("<html>")<=0 and htmlcontent.find("<body>")<=0
meta = "<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>\n"
meta += "<meta http-equiv='Cache-Control' content='no-cache, no-store, must-revalidate' />\n"
meta += "<meta http-equiv='Pragma' content='no-cache' />\n"
meta += "<meta http-equiv='Expires' content='0' />"
if addexpiremetas:
meta += "<meta http-equiv='Cache-Control' content='no-cache, no-store, must-revalidate' />\n"
meta += "<meta http-equiv='Pragma' content='no-cache' />\n"
meta += "<meta http-equiv='Expires' content='0' />"
comment = "<!-- AUTOGENERATED HTML from CourseBuilder, CEF -->"
bodystyle = "style='font-family: times new roman, times, serif;font-size: 12pt;color: #000000;'" # org BS "style='font-family: Verdana;font-size: 12pt;color: #494c4e;'"
return f"<!DOCTYPE html>\n<html>\n{comment}\n{meta}\n<body {bodystyle}>\n" + htmlcontent + "\n</body>\n</html>"
......
......@@ -456,7 +456,7 @@ if __name__ == '__main__':
return htmlstructure
try:
def MkHtml(htmlstructure, addhtmlheaders, filenamebase):
def MkHtml(htmlstructure, filenamebase, testlinks, addexpiremetas, addhtmlheaders=True):
for i in htmlstructure:
assert Str(i).find("CONTENT")==0
......@@ -467,7 +467,7 @@ if __name__ == '__main__':
htmlcontent = Str(htmlstructure[i])
Dbg(verbose, f" {Col('YELLOW')}WRITING {i:40s} => '{outputfilename}'{ColEnd()}", 1)
html = MkHtmlPage(htmlcontent) if Bool(addhtmlheaders) else htmlcontent
html = MkHtmlPage(htmlcontent, addexpiremetas) if Bool(addhtmlheaders) else htmlcontent
with Outputfile(outputfilename) as f:
f.write(html)
......@@ -491,24 +491,26 @@ if __name__ == '__main__':
parser = ArgumentParser(prog=argv[0], epilog="version 0.2")
parser.add_argument("-v", default=verbose, action="count", help=f"increase output verbosity, default={verbose}\n")
parser.add_argument("-t", default=False, action="store_true", help=f"generate simple html (witouth <html> <body> etc tags), default=False\n")
parser.add_argument("-l", default=False, action="store_true", help=f"test links, default=False\n")
# parser.add_argument("-s", default=False, action="store_true", help=f"generate simple html (witouth <html> <body> etc tags), default=False\n")
parser.add_argument("-t", default=False, action="store_true", help=f"test links, default=False\n")
parser.add_argument("-x", default=False, action="store_true", help=f"add html expire headers, default=False\n")
parser.add_argument("-o", default=outputfiledir, type=str, help=f"output file dir base, default='{outputfiledir}'\n")
parser.add_argument("-c", default=coursefile, type=str, help=f"cause file to be parsed, default='{coursefile}'\n")
args = parser.parse_args()
verbose = Int(args.v)
coursefile = Str(args.c)
outputfiledir = Str(args.o)
testlinks = Bool(args.t)
verbose = Int(args.v)
testlinks = Bool(args.t)
addexpiremetas = Bool(args.x)
outputfiledir = Str(args.o)
coursefile = Str(args.c)
Dbg(verbose, f"{Col('PURPLE')}GENERATING html course from file '{coursefile}', outputfiledir={outputfiledir}..{ColEnd()}")
htmlencoded = [HtmlEncode(i) for i in LoadCourseFile(coursefile)]
htmlstructure = ParseStructure(htmlencoded)
MkHtml(htmlstructure, not Bool(args.t), outputfiledir)
MkHtml(htmlstructure, outputfiledir, testlinks, addexpiremetas)
Dbg(verbose, f"{Col('PURPLE')}DONE{ColEnd()}")
......
......@@ -2,9 +2,7 @@
<html>
<!-- AUTOGENERATED HTML from CourseBuilder, CEF -->
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
<meta http-equiv='Cache-Control' content='no-cache, no-store, must-revalidate' />
<meta http-equiv='Pragma' content='no-cache' />
<meta http-equiv='Expires' content='0' />
<body style='font-family: times new roman, times, serif;font-size: 12pt;color: #000000;'>
<h3>Web sites</h3>
......
......@@ -2,9 +2,7 @@
<html>
<!-- AUTOGENERATED HTML from CourseBuilder, CEF -->
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
<meta http-equiv='Cache-Control' content='no-cache, no-store, must-revalidate' />
<meta http-equiv='Pragma' content='no-cache' />
<meta http-equiv='Expires' content='0' />
<body style='font-family: times new roman, times, serif;font-size: 12pt;color: #000000;'>
Der er adgang til en GPU baseret server i forbindelse med kurset. Serveren består af en
......
......@@ -2,9 +2,7 @@
<html>
<!-- AUTOGENERATED HTML from CourseBuilder, CEF -->
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
<meta http-equiv='Cache-Control' content='no-cache, no-store, must-revalidate' />
<meta http-equiv='Pragma' content='no-cache' />
<meta http-equiv='Expires' content='0' />
<body style='font-family: times new roman, times, serif;font-size: 12pt;color: #000000;'>
<dl>
......
......@@ -2,9 +2,7 @@
<html>
<!-- AUTOGENERATED HTML from CourseBuilder, CEF -->
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
<meta http-equiv='Cache-Control' content='no-cache, no-store, must-revalidate' />
<meta http-equiv='Pragma' content='no-cache' />
<meta http-equiv='Expires' content='0' />
<body style='font-family: times new roman, times, serif;font-size: 12pt;color: #000000;'>
<h3>Formål</h3>
......
......@@ -2,9 +2,7 @@
<html>
<!-- AUTOGENERATED HTML from CourseBuilder, CEF -->
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
<meta http-equiv='Cache-Control' content='no-cache, no-store, must-revalidate' />
<meta http-equiv='Pragma' content='no-cache' />
<meta http-equiv='Expires' content='0' />
<body style='font-family: times new roman, times, serif;font-size: 12pt;color: #000000;'>
<h3>Hands-on Machine Learning <span style='font-family: courier new, courier;'>[HOML]</span></h3>
......
......@@ -2,9 +2,7 @@
<html>
<!-- AUTOGENERATED HTML from CourseBuilder, CEF -->
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
<meta http-equiv='Cache-Control' content='no-cache, no-store, must-revalidate' />
<meta http-equiv='Pragma' content='no-cache' />
<meta http-equiv='Expires' content='0' />
<body style='font-family: times new roman, times, serif;font-size: 12pt;color: #000000;'>
<h3>Backend file structure</h3>
......
......@@ -2,9 +2,7 @@
<html>
<!-- AUTOGENERATED HTML from CourseBuilder, CEF -->
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
<meta http-equiv='Cache-Control' content='no-cache, no-store, must-revalidate' />
<meta http-equiv='Pragma' content='no-cache' />
<meta http-equiv='Expires' content='0' />
<body style='font-family: times new roman, times, serif;font-size: 12pt;color: #000000;'>
<style type='text/css'>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment