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.

Sign up for GitHub

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

Jump to bottom

Addresses #4647, wrap the E+ Table:Lookup, Table:IndependentVariableList, and Table:IndependentVariable objects #4652

Merged
merged 66 commits into from
Sep 8, 2022
Merged

Addresses #4647, wrap the E+ Table:Lookup, Table:IndependentVariableList, and Table:IndependentVariable objects #4652

merged 66 commits into from
Sep 8, 2022

Commits on Aug 19, 2022

  1. Updates to idd.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    944dbdb View commit details
    Browse the repository at this point in the history

  2. Deprecate table multivariable lookup.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    079d88e View commit details
    Browse the repository at this point in the history

  3. Stub table lookup model files.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    400d3b0 View commit details
    Browse the repository at this point in the history

  4. Stub table lookup ft files.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    301a7f0 View commit details
    Browse the repository at this point in the history

  5. Formatting.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    441766e View commit details
    Browse the repository at this point in the history

  6. Minor updates.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    c92dfc8 View commit details
    Browse the repository at this point in the history

  7. Use modelobjectlists for variablelist.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    ae6b64b View commit details
    Browse the repository at this point in the history

  8. Stub table independent variable model files.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    cb07c92 View commit details
    Browse the repository at this point in the history

  9. Stub table independent variable ft files.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    b3f5cfc View commit details
    Browse the repository at this point in the history

  10. Formatting.

    @joseph-robertson
    joseph-robertson committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    e70f2e8 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. Merge branch 'develop' into table-lookup

    @joseph-robertson
    joseph-robertson committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    6d26fcc View commit details
    Browse the repository at this point in the history

  2. Progress on model files.

    @joseph-robertson
    joseph-robertson committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    9fa13cd View commit details
    Browse the repository at this point in the history

  3. Formatting.

    @joseph-robertson
    joseph-robertson committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    632782d View commit details
    Browse the repository at this point in the history

  4. Few updates.

    @joseph-robertson
    joseph-robertson committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    1bd7c00 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2022

  1. Change ind var to resource object.

    @joseph-robertson
    joseph-robertson committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    9233e3a View commit details
    Browse the repository at this point in the history

  2. Stub more ft.

    @joseph-robertson
    joseph-robertson committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    2b501a6 View commit details
    Browse the repository at this point in the history

  3. Stub lookup ctor.

    @joseph-robertson
    joseph-robertson committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    722eb4f View commit details
    Browse the repository at this point in the history

  4. Start filling in getters and setters.

    @joseph-robertson
    joseph-robertson committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    e146312 View commit details
    Browse the repository at this point in the history

  5. Progress on ft.

    @joseph-robertson
    joseph-robertson committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    0fcdbe9 View commit details
    Browse the repository at this point in the history

  6. Start filling out model tests for basic function.

    @joseph-robertson
    joseph-robertson committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    51d234c View commit details
    Browse the repository at this point in the history

  7. Start filling out ft tests for basic function.

    @joseph-robertson
    joseph-robertson committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    7a3fc5c View commit details
    Browse the repository at this point in the history

  8. Fix in ft test.

    @joseph-robertson
    joseph-robertson committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    4d23c12 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2022

  1. Update model tests.

    @joseph-robertson
    joseph-robertson committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    9afa622 View commit details
    Browse the repository at this point in the history

  2. Fix tests.

    @joseph-robertson
    joseph-robertson committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    384a988 View commit details
    Browse the repository at this point in the history

  3. Fix ft test.

    @joseph-robertson
    joseph-robertson committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    a306bb5 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2022

  1. Updates to ft.

    @joseph-robertson
    joseph-robertson committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    1450bb3 View commit details
    Browse the repository at this point in the history

  2. Add methods for extensible groups.

    @joseph-robertson
    joseph-robertson committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    fef1128 View commit details
    Browse the repository at this point in the history

  3. Clean up ft.

    @joseph-robertson
    joseph-robertson committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    228b3f1 View commit details
    Browse the repository at this point in the history

  4. Hook sources back up in ft.

    @joseph-robertson
    joseph-robertson committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    2dd4b56 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2022

  1. Merge branch 'develop' into table-lookup

    @joseph-robertson
    joseph-robertson committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    c6ab3bf View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2022

  1. Add remaining lookup methods.

    @joseph-robertson
    joseph-robertson committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    aab51b4 View commit details
    Browse the repository at this point in the history

  2. Update idd and ft replacement.

    @joseph-robertson
    joseph-robertson committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    a878e52 View commit details
    Browse the repository at this point in the history

  3. Formatting.

    @joseph-robertson
    joseph-robertson committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    bc6822a View commit details
    Browse the repository at this point in the history

  4. Wrong return types.

    @joseph-robertson
    joseph-robertson committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    87b4699 View commit details
    Browse the repository at this point in the history

  5. Actually return in remove methods.

    @joseph-robertson
    joseph-robertson committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    631ddf3 View commit details
    Browse the repository at this point in the history

  6. Minor idd updates.

    @joseph-robertson
    joseph-robertson committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    432555b View commit details
    Browse the repository at this point in the history

  7. Finish table methods.

    @joseph-robertson
    joseph-robertson committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    6d6cc55 View commit details
    Browse the repository at this point in the history

  8. Finish ft and replacement.

    @joseph-robertson
    joseph-robertson committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    829b114 View commit details
    Browse the repository at this point in the history

  9. Update model and ft tests.

    @joseph-robertson
    joseph-robertson committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    c0b94ce View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2022

  1. Fix model and ft tests.

    @joseph-robertson
    joseph-robertson committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    513e531 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. Modify TableIndependentVariable

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    8ecd225 View commit details
    Browse the repository at this point in the history

  2. Modify TableLookup

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    8304c9d View commit details
    Browse the repository at this point in the history

  3. add TableLookup::setOutputValues(vector<double>) + adjust gtest

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    dced8f0 View commit details
    Browse the repository at this point in the history

  4. add TableIndependentVariable::setValues(vector<double>) + adjust gtest

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    eb66a23 View commit details
    Browse the repository at this point in the history

  5. Add a (failing) Gtest for TableLookup clone & remove (see failing log… 

    …s in description)

```
[ RUN      ] ModelFixture.TableLookup_Clone
/home/julien/Software/Others/OpenStudio/src/model/test/TableLookup_GTest.cpp:189: Failure
Expected equality of these values:
  1u
    Which is: 1
  m2.getModelObjects<TableIndependentVariable>().size()
    Which is: 0
/home/julien/Software/Others/OpenStudio/src/model/test/TableLookup_GTest.cpp:190: Failure
Expected equality of these values:
  1u
    Which is: 1
  m2.getModelObjects<ModelObjectList>().size()
    Which is: 0
/home/julien/Software/Others/OpenStudio/src/model/test/TableLookup_GTest.cpp:192: Failure
Expected equality of these values:
  1u
    Which is: 1
  tableLookupClone2.independentVariables().size()
    Which is: 0
[  FAILED  ] ModelFixture.TableLookup_Clone (4 ms)
[ RUN      ] ModelFixture.TableLookup_Remove
/home/julien/Software/Others/OpenStudio/src/model/test/TableLookup_GTest.cpp:216: Failure
Expected equality of these values:
  0u
    Which is: 0
  m.getModelObjects<TableIndependentVariable>().size()
    Which is: 1
/home/julien/Software/Others/OpenStudio/src/model/test/TableLookup_GTest.cpp:217: Failure
Expected equality of these values:
  0u
    Which is: 0
  m.getModelObjects<ModelObjectList>().size()
    Which is: 1
/home/julien/Software/Others/OpenStudio/src/model/test/TableLookup_GTest.cpp:244: Failure
Expected equality of these values:
  1u
    Which is: 1
  m.getModelObjects<ModelObjectList>().size()
    Which is: 2
[  FAILED  ] ModelFixture.TableLookup_Remove (5 ms)

```
    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    a9d87a7 View commit details
    Browse the repository at this point in the history

  6. Small fixup for numVariables / outputVariableNames + break FT tests i… 

    …nto 3
    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    09380da View commit details
    Browse the repository at this point in the history

  7. Override TableLookup::clone & remove

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    b4255ac View commit details
    Browse the repository at this point in the history

  8. Redo the ft, and add a translateTableIndependentVariable to avoid dup… 

    …lication
    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    f5d52a7 View commit details
    Browse the repository at this point in the history

  9. This is actually the grid size (product of UNIQUE count of independen… 

    …tVaraibles) that must match the TableLookup's outputValues size
    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    75a179f View commit details
    Browse the repository at this point in the history

  10. Extend FT tests

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    78103b1 View commit details
    Browse the repository at this point in the history

  11. Add a VT test

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    f49be26 View commit details
    Browse the repository at this point in the history

  12. Add VT for TableMultiVariableLookup to TableLookup

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    f796e1c View commit details
    Browse the repository at this point in the history

  13. Port Coil Cooling/Heating Four Pipe Beam to using TableLookup

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    db490c5 View commit details
    Browse the repository at this point in the history

  14. Change tests to use TableLookup too

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    bd9961f View commit details
    Browse the repository at this point in the history

  15. Deprecate the entire TableMultivariableLookup and pragma ignore depre… 

    …cation where appropriate
    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    6d14235 View commit details
    Browse the repository at this point in the history

  16. Port sdd MapHVAC to use TableLookup

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    f3b8016 View commit details
    Browse the repository at this point in the history

  17. Update src/energyplus/ForwardTranslator.cpp

    @jmarrec
    jmarrec committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    9d60fca View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2022

  1. Forgot to connect TableLookup to TableIndependentVariable 

    found via NREL/OpenStudio-resources#173
    @jmarrec
    jmarrec committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    461407e View commit details
    Browse the repository at this point in the history

  2. For VT, need to match Ctor and initialize Normalization Divisor/Method 

    found via NREL/OpenStudio-resources#173
    @jmarrec
    jmarrec committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    521ee35 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into table-lookup

    @jmarrec
    jmarrec committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    b79b389 View commit details
    Browse the repository at this point in the history

  4. Put back old FT for TableMultiVariableLookup (easier to remove than t… 

    …he model conversion in ForwardTransaltor.cpp)) + Macroize the ignore of deprecated methods (DISABLE_WARNING_DEPRECATED) for clarity/shortness

change macro formatting
    @jmarrec
    jmarrec committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    1c7521a View commit details
    Browse the repository at this point in the history

  5. Partially revert 1c7521a7910: swig chokes on the macro

    @jmarrec
    jmarrec committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    019c0b5 View commit details
    Browse the repository at this point in the history

  6. Write a ReverseTranslator + RT Test for TableLookup

    @jmarrec
    jmarrec committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    669969a View commit details
    Browse the repository at this point in the history

  7. Slightly Adjust FT for TableMultiVariableLookup

    @jmarrec
    jmarrec committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    8ce7017 View commit details
    Browse the repository at this point in the history

  8. Tweak getString to use uninitialized empty

    @jmarrec
    jmarrec committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    45452ea View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. Merge branch 'develop' into table-lookup

    @joseph-robertson
    joseph-robertson committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    a8f312b View commit details
    Browse the repository at this point in the history