Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue186 correct class path #187

Merged
merged 6 commits into from
Apr 21, 2022
Merged

Issue186 correct class path #187

merged 6 commits into from
Apr 21, 2022

Conversation

JayHuLBL
Copy link
Contributor

This closes #185, #186.

  • updated download link of Maven. This addressed issue Update Maven link #185.
  • updated the CDL classes as blocks like CDL.Continuous.LimPID and CDL.Continuous.Gain are no longer valid.
  • corrected a bug when exporting HTML in modelica mode.
  • updated reference results

@JayHuLBL JayHuLBL requested a review from anandkp92 April 13, 2022 18:11
@JayHuLBL JayHuLBL self-assigned this Apr 13, 2022
@JayHuLBL
Copy link
Contributor Author

@anandkp92 Would you please check if you see the issues #185 and #186, and if yes, see if this PR fix that?

@anandkp92
Copy link
Member

anandkp92 commented Apr 14, 2022

Hi @JayHuLBL

The maven path seems to work! However, I encountered an issue where I had both 3.6.3 and 3.8.5 maven versions and there were some errors. Maybe we can include a "rm -r apache_maven" before downloading and extracting?

Regarding the other changes. I see that you have fixed some updates to CDL and also regenerated the reference results. But when I run make test, I still run into failures.

  parser.js
    Testing parse from Modelica to raw Json, in "cdl" parsing mode
      ✓ Testing unmodified json for equality, "cdl" mode (5998ms)
    Testing parse from Modelica to raw Json, in "modelica" parsing mode
      ✓ Testing unmodified json for equality, "modelica" mode (6758ms)
    Testing parse from Modelica to Json, in "cdl" parsing mode
      ✓ Testing json for equality, "cdl" mode (18930ms)
    Testing parse from Modelica to Json, in "modelica" parsing mode
      ✓ Testing json for equality, "modelica" mode (6805ms)
    Testing html generation from Modelica, in "cdl" parsing mode
      ✓ Testing html for equality (19057ms)
    Testing html generation from Modelica, in "modelica" parsing mode
      ✓ Testing html for equality (6691ms)
    Testing docx generation from Modelica, in "cdl" parsing mode
      ✓ Testing Docx for equality (21819ms)
Handling Promise rejection AssertionError [ERR_ASSERTION]: Docxrepresentation differs for /Users/akprakash/Programming/modelica/modelica-json/test/FromModelica/cdl/docx/FromModelica.CustomPWithLimiter.docx
    at /Users/akprakash/Programming/modelica/modelica-json/test/test_parser.js:369:12
    at tryCatcher (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/util.js:16:23)
    at Promise._settlePromiseFromHandler (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:547:31)
    at Promise._settlePromise (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:604:18)
    at Promise._settlePromise0 (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:649:10)
    at Promise._settlePromises (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:729:18)
    at Promise._fulfill (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:673:18)
    at PromiseArray._resolve (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise_array.js:127:19)
    at PromiseArray._promiseFulfilled (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise_array.js:145:14)
    at Promise._settlePromise (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:609:26)
    at Promise._settlePromise0 (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:649:10)
    at Promise._settlePromises (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:729:18)
    at Promise._fulfill (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:673:18)
    at Promise._resolveCallback (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:466:57)
    at Promise._settlePromiseFromHandler (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:559:17)
    at Promise._settlePromise (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:604:18)
    at Promise._settlePromise0 (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:649:10)
    at Promise._settlePromises (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:729:18)
    at Promise._fulfill (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:673:18)
    at Promise._resolveCallback (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:466:57)
    at Promise._settlePromiseFromHandler (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:559:17)
    at Promise._settlePromise (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:604:18)
    at Promise._settlePromise0 (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:649:10)
    at Promise._settlePromises (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:729:18)
    at Promise._fulfill (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:673:18)
    at PromiseArray._resolve (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise_array.js:127:19)
    at PromiseArray._promiseFulfilled (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise_array.js:145:14)
    at Promise._settlePromise (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:609:26)
    at Promise._settlePromise0 (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:649:10)
    at Promise._settlePromises (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/promise.js:729:18)
    at _drainQueueStep (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/async.js:93:12)
    at _drainQueue (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/async.js:86:9)
    at Async._drainQueues (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/async.js:102:5)
    at Immediate.Async.drainQueues [as _onImmediate] (/Users/akprakash/Programming/modelica/modelica-json/node_modules/bluebird/js/release/async.js:15:14)
    at processImmediate (internal/timers.js:464:21) {
  generatedMessage: false,
  code: 'ERR_ASSERTION',
  actual: '\n' +
    '\n' +
    '<h2>FromModelica.CustomPWithLimiter<a name=3D"FromModelica.CustomPWithLimiter"></a></h2>\n' +
    '\n' +
    '  <span class=3D"ModelicaDescription">Custom implementation of a P controller with variable output limiter</span><br>\n' +
    '\n' +
    '<h3>Info</h3>\n' +
    '  \n' +
    '<p>\n' +
    'Block that outputs <code>y =3D min(yMax, k*e)</code>,\n' +
    '...',
  expected: '\n' +
    '\n' +
    '<h2>FromModelica.CustomPWithLimiter<a name=3D"FromModelica.CustomPWithLimiter"></a></h2>\n' +
    '\n' +
    '  <span class=3D"ModelicaDescription">Custom implementation of a P controller with variable output limiter</span><br>\n' +
    '\n' +
    '<h3>Info</h3>\n' +
    '  \n' +
    '<p>\n' +
    'Block that outputs <code>y =3D min(yMax, k*e)</code>,\n' +
    '...',
  operator: '=='
}
    Testing docx generation from Modelica, in "modelica" parsing mode
      ✓ Testing docx for equality (6821ms)

  util
    getModelicaFileName()
      ✓ must be equal
    getModelicaFileName() with full name
      ✓ must be equal


  17 passing (2m)

(node:65185) Warning: Accessing non-existent property 'cat' of module exports inside circular dependency
(Use `node --trace-warnings ...` to show where the warning was created)
(node:65185) Warning: Accessing non-existent property 'cd' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'chmod' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'cp' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'dirs' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'pushd' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'popd' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'echo' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'tempdir' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'pwd' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'exec' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'ls' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'find' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'grep' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'head' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'ln' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'mkdir' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'rm' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'mv' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'sed' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'set' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'sort' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'tail' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'test' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'to' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'toEnd' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'touch' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'uniq' of module exports inside circular dependency
(node:65185) Warning: Accessing non-existent property 'which' of module exports inside circular dependency
standard: Use JavaScript Standard Style (https://standardjs.com)
standard: Run `standard --fix` to automatically fix some problems.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:75:18: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:76:1: 'outputs' is not defined.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:76:29: Strings must use singlequote.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:78:1: 'rawJsonData' is not defined.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:80:1: 'outputs' is not defined.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:80:25: Missing space before function parentheses.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:84:5: Closing curly brace does not appear on the same line as the subsequent block.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:87:5: Closing curly brace does not appear on the same line as the subsequent block.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:90:5: Closing curly brace does not appear on the same line as the subsequent block.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:93:74: 'rawJsonData' is not defined.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:95:3: Closing curly brace does not appear on the same line as the subsequent block.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:98:30: 'rawJsonData' is not defined.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:100:3: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:105:21: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:106:1: 'outputs' is not defined.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:106:25: Missing space before function parentheses.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:108:3: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:113:1: 'outputs' is not defined.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:113:25: Missing space before function parentheses.
  /Users/akprakash/Programming/modelica/modelica-json/2app.js:117:3: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:4:39: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:5:62: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:6:60: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:7:7: Identifier 'stored_definitionVisitor' is not in camel case.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:7:71: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:11:49: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:13:57: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:14:33: A constructor name should not start with a lowercase letter.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:14:59: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:15:62: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:16:35: A constructor name should not start with a lowercase letter.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:16:68: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:17:46: A constructor name should not start with a lowercase letter.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:17:72: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:19:42: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:20:1: Too many blank lines at the end of file. Max of 0 allowed.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:1:80: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:2:7: Identifier 'stored_definition' is not in camel case.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:2:64: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:3:7: 'nameVisitor' is assigned a value but never used.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:3:45: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:5:7: Identifier 'stored_definitionVisitor' is not in camel case.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:6:5: Expected indentation of 2 spaces but found 4.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:6:16: Missing space before function parentheses.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:7:9: Expected indentation of 6 spaces but found 8.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:7:35: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:8:9: Expected indentation of 6 spaces but found 8.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:8:20: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:10:5: Expected indentation of 2 spaces but found 4.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:10:5: Identifier 'visitStored_definition' is not in camel case.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:10:27: Missing space before function parentheses.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:11:9: Expected indentation of 6 spaces but found 8.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:12:13: Expected indentation of 10 spaces but found 12.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:13:11: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:14:1: Trailing spaces not allowed.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:14:1: More than 1 blank line not allowed.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:16:9: Expected indentation of 6 spaces but found 8.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:16:67: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:20:78: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:22:36: Identifier 'stored_definitionVisitor' is not in camel case.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:22:60: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:23:61: Extra semicolon.
  /Users/akprakash/Programming/modelica/modelica-json/jsParser/stored_definitionVisitor.js:23:62: Newline required at end of file but not found.

Not sure if this is an issue with my local installation.

@JayHuLBL
Copy link
Contributor Author

@anandkp92
The warnings you reported would be caused by the inside circular dependency, such like in lib/util.js requiring lib/parser.js, while lib/parser.js requiring lib/util.js.
Regarding the errors like:
/Users/akprakash/Programming/modelica/modelica-json/jsParser/main.js:4:39: Extra semicolon., is it something related to your work on converting Java script to JavaScript script? I don't record we have main.js script, but do have Main.java.

@JayHuLBL
Copy link
Contributor Author

This PR will be merged. The warnings will be addressed in separated issue #188.

@JayHuLBL JayHuLBL merged commit 0225018 into master Apr 21, 2022
@anandkp92
Copy link
Member

So jsParser/main.js is a local file on my computer that is part of another issue. When we run make test it runs all the js scripts in the folder, including my in-progress files. So I tried running make test with a fresh clone of the repository and everything worked fine!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Maven link
2 participants