Changeset 14003


Ignore:
Timestamp:
07/05/16 21:25:28 (5 years ago)
Author:
mkommend
Message:

#2243: Merged r13932, r13933, r13984 into stable.

Location:
stable
Files:
1 deleted
8 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.ExtLibs

  • stable/HeuristicLab.ExtLibs.sln

    r12732 r14003  
    22Microsoft Visual Studio Solution File, Format Version 12.00
    33# Visual Studio 2013
    4 VisualStudioVersion = 12.0.31101.0
     4VisualStudioVersion = 12.0.40629.0
    55MinimumVisualStudioVersion = 10.0.40219.1
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DayView-1.0", "HeuristicLab.ExtLibs\HeuristicLab.DayView\1.0\HeuristicLab.DayView-1.0.csproj", "{02766ECC-D0F5-4115-9ECA-47409167B638}"
     
    1717  EndProjectSection
    1818EndProject
    19 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MathJax-1.1", "HeuristicLab.ExtLibs\HeuristicLab.MathJax\1.1\HeuristicLab.MathJax-1.1\HeuristicLab.MathJax-1.1.csproj", "{BF4C452F-4903-44E6-89B7-DF93D02C4819}"
    20 EndProject
    2119Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtocolBuffers-2.4.1.473", "HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\2.4.1\ProtobufCS\src\ProtocolBuffers\ProtocolBuffers-2.4.1.473.csproj", "{6908BDCE-D925-43F3-94AC-A531E6DF2591}"
    2220EndProject
     
    7270EndProject
    7371Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SimSharp-3.0.7", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.7\HeuristicLab.SimSharp-3.0.7\HeuristicLab.SimSharp-3.0.7.csproj", "{5C93CAF7-AE6A-4540-95B2-5DA6761A2677}"
     72EndProject
     73Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MathJax-2.6.1", "HeuristicLab.ExtLibs\HeuristicLab.MathJax\2.6.1\HeuristicLab.MathJax-2.6.1\HeuristicLab.MathJax-2.6.1.csproj", "{BCDA17A6-5B4A-495C-B182-E856CA081BE6}"
    7474EndProject
    7575Global
     
    131131    {94186A6A-5176-4402-AE83-886557B53CCA}.Release|x86.ActiveCfg = Release|x86
    132132    {94186A6A-5176-4402-AE83-886557B53CCA}.Release|x86.Build.0 = Release|x86
    133     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    134     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Debug|Any CPU.Build.0 = Debug|Any CPU
    135     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Debug|x64.ActiveCfg = Debug|x64
    136     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Debug|x64.Build.0 = Debug|x64
    137     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Debug|x86.ActiveCfg = Debug|x86
    138     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Debug|x86.Build.0 = Debug|x86
    139     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Release|Any CPU.ActiveCfg = Release|Any CPU
    140     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Release|Any CPU.Build.0 = Release|Any CPU
    141     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Release|x64.ActiveCfg = Release|x64
    142     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Release|x64.Build.0 = Release|x64
    143     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Release|x86.ActiveCfg = Release|x86
    144     {BF4C452F-4903-44E6-89B7-DF93D02C4819}.Release|x86.Build.0 = Release|x86
    145133    {6908BDCE-D925-43F3-94AC-A531E6DF2591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    146134    {6908BDCE-D925-43F3-94AC-A531E6DF2591}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    467455    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x86.ActiveCfg = Release|x86
    468456    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x86.Build.0 = Release|x86
     457    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     458    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
     459    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Debug|x64.ActiveCfg = Debug|x64
     460    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Debug|x64.Build.0 = Debug|x64
     461    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Debug|x86.ActiveCfg = Debug|x86
     462    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Debug|x86.Build.0 = Debug|x86
     463    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
     464    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Release|Any CPU.Build.0 = Release|Any CPU
     465    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Release|x64.ActiveCfg = Release|x64
     466    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Release|x64.Build.0 = Release|x64
     467    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Release|x86.ActiveCfg = Release|x86
     468    {BCDA17A6-5B4A-495C-B182-E856CA081BE6}.Release|x86.Build.0 = Release|x86
    469469  EndGlobalSection
    470470  GlobalSection(SolutionProperties) = preSolution
  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MathSymbolicDataAnalysisModelView.cs

    r12009 r14003  
    6161        HtmlElement newElement = webBrowser.Document.GetElementById("model");
    6262        newElement.InnerText = formatter.Format(Content.SymbolicExpressionTree);
     63        webBrowser.Document.InvokeScript("refreshModel");
    6364      } else {
    6465        HtmlElement newElement = webBrowser.Document.GetElementById("model");
    6566        newElement.InnerText = string.Empty;
    6667      }
    67       webBrowser.Document.InvokeScript("refreshModel");
    6868    }
    6969  }
  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/displayModelFrame.html

    r7446 r14003  
    1 <!-- this file is derived from sample.html from the MathJax distribution -->
    2 <!-- Copyright (c) 2009-2011 Design Science, Inc. -->
     1<!-- this file is derived from sample_tex.html from the MathJax distribution -->
     2<!-- Copyright (c) 2010-2015 The MathJax Consortium -->
    33<!-- adapted by HEAL for HeuristicLab-->
    44<!DOCTYPE html>
    55<html>
    66<head>
    7   <!-- title change by HEAL -->
    8   <title>Symbolic Expression Tree</title>
    9   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    10   <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
    11   <script type="text/x-mathjax-config">
    12   MathJax.Hub.Config({
    13     extensions: ["tex2jax.js", "TeX/AMSmath.js", "TeX/AMSsymbols.js"],
    14     jax: ["input/TeX","output/HTML-CSS"],
    15     tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]},
    16     imageFont: null
    17   });
    18  
    19 </script>
    20   <script type="text/javascript" src="./MathJax.js"></script>
    21   <!-- begin changes by HEAL -->
    22   <script type="text/javascript">
    23   function refreshModel() {
    24     var model = document.getElementById("model");
    25     MathJax.Hub.Queue(["Typeset",MathJax.Hub,model]);
    26   }
    27 </script>
    28   <!-- end changes by HEAL -->
    29   <style>
    30 h1 {text-align:center}
    31 h2 {
    32   font-weight: bold;
    33   background-color: #DDDDDD;
    34   padding: .2em .5em;
    35   margin-top: 1.5em;
    36   border-top: 3px solid #666666;
    37   border-bottom: 2px solid #999999;
    38 }
    39 </style>
     7    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     8    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     9    <meta name="viewport" content="width=device-width, initial-scale=1">
     10
     11    <!-- title change by HEAL -->
     12    <title>Symbolic Expression Tree</title>
     13
     14    <script type="text/x-mathjax-config">
     15        MathJax.Hub.Config({
     16        extensions: ["tex2jax.js", "TeX/AMSmath.js", "TeX/AMSsymbols.js"],
     17        jax: ["input/TeX","output/SVG"],
     18        tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]},
     19        "HTML-CSS": {preferredFont: "STIX-Web"},
     20        MathMenu: { showLocale:false},
     21        imageFont: null
     22        });
     23    </script>
     24
     25    <script type="text/javascript" async
     26            src="./MathJax/MathJax.js?config=TeX-AMS_SVG&locale=en">
     27    </script>
     28    <script type="text/javascript">
     29        <!-- necessary to re-typeset when the model is changed-->
     30        function refreshModel() {
     31            var model = document.getElementById("model");
     32            <!-- see https://docs.mathjax.org/en/v1.1-latest/typeset.html -->
     33            MathJax.Hub.Queue(["Typeset",MathJax.Hub,model]);
     34        }
     35    </script>
    4036</head>
    4137<body id="body">
    42   <noscript>
    43     <div style="color: #CC0000; text-align: center">
    44       <b>Warning: <a href="http://www.mathjax.org/">MathJax</a> requires JavaScript to process
    45         the mathematics on this page.<br />
    46         If your browser supports JavaScript, be sure it is enabled.</b>
    47     </div>
    48     <hr>
    49   </noscript>
    50   <p id="model">
    51   </p>
     38    <noscript>
     39        <div style="color: #CC0000; text-align: center">
     40            <b>
     41                Warning: <a href="http://www.mathjax.org/">MathJax</a> requires JavaScript to process
     42                the mathematics on this page.<br />
     43                If your browser supports JavaScript, be sure it is enabled.
     44            </b>
     45        </div>
     46        <hr>
     47    </noscript>
     48    <p id="model">
     49    </p>
    5250</body>
    5351</html>
  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs

    r12009 r14003  
    403403            var constStr = string.Format(System.Globalization.NumberFormatInfo.InvariantInfo, "{0:G5}", constant);
    404404            if (!constStr.Contains(".")) constStr = constStr + ".0";
    405             constStr = constStr.Replace(".", "\\negthickspace&.");  // fix problem in rendering of aligned expressions
     405            constStr = constStr.Replace(".", "&.");  // fix problem in rendering of aligned expressions
    406406            strBuilder.Append("c_{" + i + "}& = & " + constStr);
    407407            strBuilder.Append(@"\\");
Note: See TracChangeset for help on using the changeset viewer.