diff --git a/client/src/designtypes/Spring/Compression/migrate.js b/client/src/designtypes/Spring/Compression/migrate.js
index 966d68f5..929c7229 100644
--- a/client/src/designtypes/Spring/Compression/migrate.js
+++ b/client/src/designtypes/Spring/Compression/migrate.js
@@ -184,6 +184,12 @@ export function migrate(design) {
// FDCL definition in initialState for COMPRESSION. The user cannot create
// FDCL if it is not already configured in initialState.
// ***************************************************************
+ if (element.lmin === undefined) {
+ element.lmin = 0;
+ }
+ if (element.lmax === undefined) {
+ element.lmax = 0;
+ }
if (element.cmin === undefined) {
element.cmin = element.value;
}
diff --git a/client/src/designtypes/Spring/Extension/migrate.js b/client/src/designtypes/Spring/Extension/migrate.js
index 2b6c909a..bfad984a 100644
--- a/client/src/designtypes/Spring/Extension/migrate.js
+++ b/client/src/designtypes/Spring/Extension/migrate.js
@@ -134,6 +134,12 @@ export function migrate(design) {
sink.cmaxchoice = sink.cmaxchoices.indexOf(source.name);
// console.log('In migrate.propgate source.name=',source.name,'sink.cmaxchoices=',sink.cmaxchoices,'sink.cmaxchoice=',sink.cmaxchoice);
}
+ if (element.lmin === undefined) {
+ element.lmin = 0;
+ }
+ if (element.lmax === undefined) {
+ element.lmax = 0;
+ }
if (element.cmin === undefined) {
element.cmin = element.value;
}
diff --git a/client/src/designtypes/Spring/Torsion/migrate.js b/client/src/designtypes/Spring/Torsion/migrate.js
index d0750931..e7998754 100644
--- a/client/src/designtypes/Spring/Torsion/migrate.js
+++ b/client/src/designtypes/Spring/Torsion/migrate.js
@@ -90,6 +90,12 @@ export function migrate(design) {
// FDCL definition in initialState for TORSION. The user cannot create
// FDCL if it is not already configured in initialState.
// ***************************************************************
+ if (element.lmin === undefined) {
+ element.lmin = 0;
+ }
+ if (element.lmax === undefined) {
+ element.lmax = 0;
+ }
if (element.cmin === undefined) {
element.cmin = element.value;
}
diff --git a/client/src/menus/View/ViewObjectiveValue.jsx b/client/src/menus/View/ViewObjectiveValue.jsx
index e9cb570b..3f96284c 100644
--- a/client/src/menus/View/ViewObjectiveValue.jsx
+++ b/client/src/menus/View/ViewObjectiveValue.jsx
@@ -56,9 +56,7 @@ class ViewObjectiveValue extends Component {
}
renderElement(viol_sum, element, i) {
- var flags = [
- '','CONSTRAINED','FIXED','CONSTRAINED|FIXED',
- 'FDCL','CONSTRAINED|FDCL','FIXED|FDCL','CONSTRAINED|FIXED|FDCL']
+ var flags = ['','CONSTRAINED','FIXED','CONSTRAINED|FIXED','FDCL','CONSTRAINED|FDCL','FIXED|FDCL','CONSTRAINED|FIXED|FDCL']
var validity_vmin;
var validity_vmax;
var feasibility_vmin;
@@ -249,17 +247,17 @@ class ViewObjectiveValue extends Component {
| {feasibility_vmin <= 0.0 ? '' : feasibility_vmin} |
{feasibility_vmax <= 0.0 ? '' : feasibility_vmax} |
{element.value} |
- {element.lmin !== undefined ? element.validmin : ''} |
- {element.lmin !== undefined ? element.validmax : ''} |
- {element.lmin !== undefined ? flags[element.lmin] : ''} |
- {element.lmin !== undefined ? flags[element.lmax] : ''} |
- {element.lmin !== undefined ? element.cmin : ''} |
- {element.lmin !== undefined ? element.cmax : ''} |
- {element.lmin !== undefined ? element.vmin : ''} |
- {element.lmin !== undefined ? element.vmax : ''} |
- {element.lmin !== undefined ? element.sdlim : ''} |
- {element.lmin !== undefined ? element.smin : ''} |
- {element.lmin !== undefined ? element.smax : ''} |
+ {String(element.validmin)} |
+ {String(element.validmax)} |
+ {String(element.lmin)+'='+flags[element.lmin]} |
+ {String(element.lmax)+'='+flags[element.lmax]} |
+ {String(element.cmin)} |
+ {String(element.cmax)} |
+ {String(element.vmin)} |
+ {String(element.vmax)} |
+ {element.sdlim} |
+ {String(element.smin)} |
+ {String(element.smax)} |
);
}
diff --git a/client/src/menus/View/ViewSymbolTable.jsx b/client/src/menus/View/ViewSymbolTable.jsx
index f20c238d..f7846d79 100644
--- a/client/src/menus/View/ViewSymbolTable.jsx
+++ b/client/src/menus/View/ViewSymbolTable.jsx
@@ -104,8 +104,8 @@ class ViewSymbolTable extends Component {
{JSON.stringify(element.propagate)} |
{String(element.validmin)} |
{String(element.validmax)} |
- {flags[element.lmin]} |
- {flags[element.lmax]} |
+ {String(element.lmin)}={String(flags[element.lmin])} |
+ {String(element.lmax)}={String(flags[element.lmax])} |
{String(element.cmin)} |
{String(element.cmax)} |
{String(element.vmin)} |
diff --git a/scanner.js b/scanner.js
index d202f530..ed2b15df 100644
--- a/scanner.js
+++ b/scanner.js
@@ -26,23 +26,24 @@ connection.query(stmt, function(err, rows, fields) {
value.forEach((row) => {
// console.log('symbol_table=',row.value.symbol_table)
row.value.symbol_table.forEach((entry) => {
+ if (entry.lmin === undefined && entry.lmax === undefined) {
+ console.log('1 filetype=',row.type,'filename=',row.name,'user=',row.user,'version=',row.value.version,'name=',entry.name,'No lmin and lmax');
+ count++;
+ } else if (entry.lmin === undefined) {
+ console.log('2 filetype=',row.type,'filename=',row.name,'user=',row.user,'version=',row.value.version,'name=',entry.name,'No lmax');
+ count++;
+ } else if (entry.lmax === undefined) {
+ console.log('3 filetype=',row.type,'filename=',row.name,'user=',row.user,'version=',row.value.version,'name=',entry.name,'No lmax');
+ count++;
+ }
if (entry.cmin === undefined && entry.cmax === undefined) {
- console.log('1 filetype=',row.type,'filename=',row.name,'user=',row.user,'version=',row.value.version,'No cmin and cmax','name=',entry.name);
- if (!(entry.lmin & FIXED) && !(entry.lmax & FIXED)) {
- console.log('@@@','lmin=',entry.lmin,'lmax=',entry.lmax);
- }
+ console.log('4 filetype=',row.type,'filename=',row.name,'user=',row.user,'version=',row.value.version,'name=',entry.name,'No cmin and cmax');
count++;
} else if (entry.cmin === undefined) {
- console.log('2 filetype=',row.type,'filename=',row.name,'user=',row.user,'version=',row.value.version,'No cmax','name=',entry.name);
- if (!(entry.lmin & FIXED) && !(entry.lmax & FIXED)) {
- console.log('@@@','lmin=',entry.lmin,'lmax=',entry.lmax);
- }
+ console.log('5 filetype=',row.type,'filename=',row.name,'user=',row.user,'version=',row.value.version,'name=',entry.name,'No cmax');
count++;
} else if (entry.cmax === undefined) {
- console.log('3 filetype=',row.type,'filename=',row.name,'user=',row.user,'version=',row.value.version,'No cmax','name=',entry.name);
- if (!(entry.lmin & FIXED) && !(entry.lmax & FIXED)) {
- console.log('@@@','lmin=',entry.lmin,'lmax=',entry.lmax);
- }
+ console.log('6 filetype=',row.type,'filename=',row.name,'user=',row.user,'version=',row.value.version,'name=',entry.name,'No cmax');
count++;
}
})