JsMVA: use latest JSROOT, use /static path to load code

bindings/pyroot/pythonizations/python/ROOT/JsMVA/Factory.py

@@ -819,7 +819,7 @@ def __bookDNN(optString):
 
     __BookDNNHelper = __bookDNN
     clear_output()
-    JPyInterface.JsDraw.InsertCSS("NetworkDesigner.min.css")
+    JPyInterface.JsDraw.InsertCSS("NetworkDesigner.css")
     JPyInterface.JsDraw.Draw("", "NetworkDesigner", True)
 
 

bindings/pyroot/pythonizations/python/ROOT/JsMVA/JPyInterface.py

@@ -197,7 +197,8 @@ def captureObjects(*args):
 ## Class for creating the output scripts and inserting them to cell output
 class JsDraw:
     ## Base repository
-    __jsMVARepo = "https://root.cern/js/jsmva/latest"
+    #    __jsMVARepo = "https://root.cern/js/jsmva/latest"
+    __jsMVARepo = "/static/mva"
 
     ## String containing the link to JavaScript files
     __jsMVASourceDir = __jsMVARepo + "/js"
@@ -230,7 +231,10 @@ class JsDraw:
     <script type="text/javascript">
         require.config({
             paths: {
-                'JsMVA':'$PATH/JsMVA.min'
+                'JsMVA':'$PATH/JsMVA',
+                'nn': '$PATH/NeuralNetwork',
+                'dtree': '$PATH/DecisionTree',
+                'NetworkDesigner': '$PATH/NetworkDesigner'
             }
         });
     </script>
@@ -259,13 +263,10 @@ class JsDraw:
     ## Inserts initialization codes to notebook
     @staticmethod
     def InitJsMVA():
-        display(
-            HTML(
-                JsDraw.__JsMVAInitCode.substitute(
-                    {"PATH": JsDraw.__jsMVASourceDir, "CSSFile": JsDraw.__jsMVACSSDir + "/TMVAHTMLOutput.min.css"}
-                )
-            )
-        )
+        display(HTML(JsDraw.__JsMVAInitCode.substitute({
+            'PATH': JsDraw.__jsMVASourceDir,
+            'CSSFile': JsDraw.__jsMVACSSDir + '/TMVAHTMLOutput.css'
+        })))
 
     ## Inserts the draw area and drawing JavaScript to output
     # @param obj ROOT object (will be converted to JSON) or JSON string containing the data to be drawed

bindings/pyroot/pythonizations/python/ROOT/JsMVA/JsMVAMagic.py

@@ -23,7 +23,7 @@ def __init__(self, shell):
     @magic_arguments()
     @argument("arg", nargs="?", default="on", help="Enable/Disable JavaScript visualisation for TMVA")
     def jsmva(self, line):
-        from JsMVA.JPyInterface import functions
+        from ROOT.JsMVA.JPyInterface import functions
 
         args = parse_argstring(self.jsmva, line)
         if args.arg == "on":

bindings/pyroot/pythonizations/python/ROOT/JsMVA/OutputTransformer.py

@@ -242,7 +242,7 @@ def __transformOneGroup(self, firstLine):
             if (Header == None and EmptyHeader == None) or j == 0:
                 if j != 0:
                     processed_lines += 1
-                    self.iterLines.next()
+                    next(self.iterLines)
                     tmp_str += "<tr>"
                 if DatasetName or NumEvents or VariableMeanHeader:
                     if DatasetName:
@@ -256,17 +256,17 @@ def __transformOneGroup(self, firstLine):
                         fLine = VariableMeanHeader
                     count, tmp = func(fLine, self.lineIndex + j, len(self.lines) - self.lineIndex - j)
                     for x in range(count):
-                        lineIter.next()
-                        self.iterLines.next()
+                        next(lineIter)
+                        next(self.iterLines)
                     tmp_str += self.__processGroupContentLine(tmp)
                 elif CorrelationMatrixHeader:
-                    self.iterLines.next()
-                    lineIter.next()
+                    next(self.iterLines)
+                    next(lineIter)
                     ik = 1
                     matrixLines = []
                     while True:
-                        self.iterLines.next()
-                        lineIter.next()
+                        next(self.iterLines)
+                        next(lineIter)
                         ik += 1
                         if self.__isEmpty(self.lines[self.lineIndex + j + ik]):
                             break
@@ -297,8 +297,8 @@ def __transformOneGroup(self, firstLine):
                         if EndWelcome or re.match(r"[\s_/|]*", nextline) == None:
                             break
                         kw += 1
-                        self.iterLines.next()
-                        lineIter.next()
+                        next(self.iterLines)
+                        next(lineIter)
                     tmp_str += "<td><b>" + WelcomeHeader.group(1) + "</b></td></tr>"
                     tmp_str += "<tr><td><img src='https://rawgit.com/root-project/root/master/tutorials/tmva/tmva_logo.svg' width='100%' /><br />"
                     tmp_str += "<center><b>" + EndWelcome.group(1) + "</b></center></td></tr>"
@@ -376,9 +376,9 @@ def transform(self, output, error):
                             r"^\s*-*\s*(<\w+>\s*)*\s*(\w+.*\s+)(\s+)(:)\s*(.*)", self.lines[self.lineIndex + kw], re.I
                         )
                         if Header:
-                            self.iterLines.next()
+                            next(self.iterLines)
                         break
-                    self.iterLines.next()
+                    next(self.iterLines)
                     if self.__isEmpty(nextline):
                         continue
                     lre = re.match(r"\s*:\s*(.*)", nextline)