FTP as a predefined constant and unreplace_special_chars in the simulator

Author: tpressburger

fret-electron/app/components/TimeSeriesChart.js

@@ -30,6 +30,7 @@
 // ANY SUCH MATTER SHALL BE THE IMMEDIATE, UNILATERAL TERMINATION OF THIS
 // AGREEMENT.
 // *****************************************************************************
+const utils = require('../../support/utils');
 import React, { Component, FunctionComponent } from 'react';
 import PropTypes from 'prop-types';
 import {  withStyles, withTheme } from '@material-ui/core/styles';
@@ -425,7 +426,7 @@ const CustomizedLabel: FunctionComponent<any> = (props: any) => {
 //-------------------customizedlabel----------------
 
         let longName = this.props.name.length > maxNameLength;
-	let Oname = ID_to_arithexpr(this.props.name);
+      let Oname = ID_to_arithexpr(utils.unreplace_special_chars(this.props.name));
         let name = (longName) ? Oname.slice(0, maxNameLength-1) + "..." : Oname;
 //console.log("TSC:render: longName="+longName);
 //console.log("TSC:render: origname="+this.props.name);

fret-electron/app/parser/Constants.js

@@ -110,6 +110,6 @@ module.exports = Object.freeze({
   // variable mapping dialog. When, from the analysis portal, we
   // handle export of future-time formalizations, then we can add
   // persists and occurs to the list of predefined vars.
-  predefinedVars: ["persisted","occurred","prevOcc","nextOcc","preBool","preInt","preReal","absReal","absInt","minReal","minInt","maxReal","maxInt"]//,"persists","occurs"
+  predefinedVars: ["persisted","occurred","prevOcc","nextOcc","preBool","preInt","preReal","absReal","absInt","minReal","minInt","maxReal","maxInt","FTP"]//,"persists","occurs"
 
 });