Merge Master Into Test Writing Branch #2

LukeDeWaal · 2019-05-16T11:55:35Z

No description provided.

* More Tests * More unit tests * Single Rotor Tests Finished

pep8speaks · 2019-05-16T11:55:40Z

Hello @LukeDeWaal! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

In the file src/CNS/COG_calculation.py:

Line 9:80: E501 line too long (80 > 79 characters)
Line 39:80: E501 line too long (101 > 79 characters)
Line 40:16: E127 continuation line over-indented for visual indent
Line 40:80: E501 line too long (88 > 79 characters)
Line 47:80: E501 line too long (101 > 79 characters)
Line 48:16: E127 continuation line over-indented for visual indent
Line 48:80: E501 line too long (88 > 79 characters)
Line 55:80: E501 line too long (82 > 79 characters)
Line 103:1: W391 blank line at end of file

In the file src/CNS/Cm_calculations.py:

Line 57:5: E303 too many blank lines (2)
Line 94:80: E501 line too long (97 > 79 characters)
Line 108:80: E501 line too long (81 > 79 characters)
Line 112:80: E501 line too long (117 > 79 characters)
Line 113:80: E501 line too long (109 > 79 characters)
Line 119:80: E501 line too long (178 > 79 characters)
Line 120:80: E501 line too long (253 > 79 characters)
Line 121:80: E501 line too long (104 > 79 characters)
Line 134:80: E501 line too long (83 > 79 characters)
Line 143:5: E303 too many blank lines (3)
Line 152:5: E303 too many blank lines (2)
Line 155:80: E501 line too long (97 > 79 characters)
Line 160:5: E303 too many blank lines (2)
Line 162:80: E501 line too long (80 > 79 characters)
Line 174:31: E231 missing whitespace after ','
Line 174:33: E231 missing whitespace after ','
Line 175:31: E231 missing whitespace after ','
Line 175:33: E231 missing whitespace after ','
Line 176:32: E231 missing whitespace after ','
Line 176:34: E231 missing whitespace after ','
Line 178:27: E231 missing whitespace after ','
Line 178:29: E231 missing whitespace after ','
Line 178:46: E231 missing whitespace after ','
Line 178:48: E231 missing whitespace after ','
Line 179:27: E231 missing whitespace after ','
Line 179:29: E231 missing whitespace after ','
Line 179:46: E231 missing whitespace after ','
Line 179:48: E231 missing whitespace after ','
Line 180:28: E231 missing whitespace after ','
Line 180:30: E231 missing whitespace after ','
Line 180:47: E231 missing whitespace after ','
Line 180:49: E231 missing whitespace after ','
Line 186:5: E303 too many blank lines (2)
Line 219:16: W292 no newline at end of file

In the file src/CNS/cns_main.py:

Line 3:21: E231 missing whitespace after ','
Line 4:19: E231 missing whitespace after ','
Line 4:22: E231 missing whitespace after ','
Line 6:41: W292 no newline at end of file

In the file src/CNS/ground_stability.py:

Line 14:1: W391 blank line at end of file

In the file src/CNS/np_calculation.py:

Line 17:13: W292 no newline at end of file

In the file src/CNS/scissor_plot.py:

Line 11:80: E501 line too long (101 > 79 characters)
Line 23:80: E501 line too long (91 > 79 characters)
Line 50:80: E501 line too long (112 > 79 characters)
Line 62:80: E501 line too long (110 > 79 characters)

In the file src/CNS/trim_curve.py:

Line 3:1: W391 blank line at end of file

In the file src/aero_hydro/wing_surface_locations.py:

Line 4:12: E261 at least two spaces before inline comment
Line 5:20: E261 at least two spaces before inline comment
Line 7:12: E261 at least two spaces before inline comment
Line 10:7: E261 at least two spaces before inline comment
Line 11:9: E261 at least two spaces before inline comment
Line 12:8: E261 at least two spaces before inline comment
Line 13:14: E261 at least two spaces before inline comment
Line 14:12: E261 at least two spaces before inline comment
Line 19:55: E261 at least two spaces before inline comment
Line 22:18: E261 at least two spaces before inline comment
Line 23:18: E261 at least two spaces before inline comment
Line 24:55: E261 at least two spaces before inline comment
Line 30:17: E261 at least two spaces before inline comment
Line 35:38: E231 missing whitespace after ','
Line 36:1: W293 blank line contains whitespace
Line 37:6: E114 indentation is not a multiple of four (comment)
Line 37:6: E116 unexpected indentation (comment)
Line 40:1: W293 blank line contains whitespace
Line 41:6: E114 indentation is not a multiple of four (comment)
Line 41:6: E116 unexpected indentation (comment)
Line 44:1: W293 blank line contains whitespace
Line 46:61: E203 whitespace before ','
Line 46:80: E501 line too long (97 > 79 characters)
Line 46:98: W291 trailing whitespace
Line 48:1: W293 blank line contains whitespace
Line 50:1: W293 blank line contains whitespace
Line 52:1: E265 block comment should start with '# '
Line 54:77: W291 trailing whitespace
Line 55:1: W293 blank line contains whitespace
Line 58:80: E501 line too long (88 > 79 characters)
Line 62:8: W291 trailing whitespace
Line 69:80: E501 line too long (116 > 79 characters)
Line 70:80: E501 line too long (116 > 79 characters)
Line 71:80: E501 line too long (117 > 79 characters)
Line 72:80: E501 line too long (115 > 79 characters)
Line 78:11: W291 trailing whitespace
Line 82:1: E303 too many blank lines (3)
Line 83:26: E231 missing whitespace after ','
Line 83:29: E231 missing whitespace after ','
Line 83:34: W291 trailing whitespace
Line 84:80: E501 line too long (161 > 79 characters)
Line 85:16: E231 missing whitespace after ','
Line 89:15: W292 no newline at end of file

In the file src/operations/helicopter_performance_comparison/performance_comparison.py:

Line 111:80: E501 line too long (90 > 79 characters)
Line 114:80: E501 line too long (108 > 79 characters)
Line 124:80: E501 line too long (154 > 79 characters)
Line 139:80: E501 line too long (121 > 79 characters)
Line 141:80: E501 line too long (92 > 79 characters)
Line 156:54: E231 missing whitespace after ','
Line 156:80: E501 line too long (99 > 79 characters)
Line 164:80: E501 line too long (110 > 79 characters)
Line 178:80: E501 line too long (140 > 79 characters)
Line 180:80: E501 line too long (88 > 79 characters)
Line 181:80: E501 line too long (89 > 79 characters)
Line 189:80: E501 line too long (104 > 79 characters)
Line 204:80: E501 line too long (140 > 79 characters)
Line 208:21: E128 continuation line under-indented for visual indent
Line 219:80: E501 line too long (122 > 79 characters)
Line 220:80: E501 line too long (138 > 79 characters)
Line 222:10: E231 missing whitespace after ','
Line 225:25: E128 continuation line under-indented for visual indent
Line 228:25: E128 continuation line under-indented for visual indent
Line 235:9: E303 too many blank lines (2)
Line 235:80: E501 line too long (130 > 79 characters)
Line 236:80: E501 line too long (142 > 79 characters)

In the file src/performance/fpp_main.py:

Line 19:37: E251 unexpected spaces around keyword / parameter equals
Line 19:56: E251 unexpected spaces around keyword / parameter equals
Line 19:58: E251 unexpected spaces around keyword / parameter equals
Line 19:61: E231 missing whitespace after ','
Line 19:63: E231 missing whitespace after ','
Line 19:65: E231 missing whitespace after ','
Line 19:67: E231 missing whitespace after ','
Line 19:69: E231 missing whitespace after ','
Line 19:80: E501 line too long (95 > 79 characters)

In the file src/tools/CalculusTools.py:

Line 63:9: W292 no newline at end of file

In the file src/tools/CoordinateTransformations.py:

Line 30:63: E231 missing whitespace after ','
Line 30:65: E231 missing whitespace after ','
Line 33:65: E231 missing whitespace after ','
Line 33:67: E231 missing whitespace after ','
Line 36:65: E231 missing whitespace after ','
Line 36:67: E231 missing whitespace after ','
Line 40:72: W292 no newline at end of file

In the file src/tools/GoogleSheetsImport.py:

Line 8:80: E501 line too long (88 > 79 characters)
Line 21:80: E501 line too long (107 > 79 characters)
Line 39:80: E501 line too long (109 > 79 characters)
Line 46:80: E501 line too long (81 > 79 characters)

In the file src/tools/JSON_to_Excel.py:

Line 22:5: E303 too many blank lines (2)
Line 28:80: E501 line too long (94 > 79 characters)
Line 44:80: E501 line too long (88 > 79 characters)
Line 56:1: E303 too many blank lines (3)
Line 58:80: E501 line too long (100 > 79 characters)

In the file src/tools/NumericalTools.py:

Line 68:80: E501 line too long (90 > 79 characters)
Line 68:82: E251 unexpected spaces around keyword / parameter equals
Line 68:84: E251 unexpected spaces around keyword / parameter equals
Line 94:80: E501 line too long (102 > 79 characters)
Line 98:80: E501 line too long (99 > 79 characters)
Line 101:5: E303 too many blank lines (2)
Line 105:80: E501 line too long (92 > 79 characters)
Line 118:1: E303 too many blank lines (5)
Line 120:35: W292 no newline at end of file
Line 120:35: W292 no newline at end of file
Line 120:35: W292 no newline at end of file

In the file src/tools/WebScraping.py:

Line 26:80: E501 line too long (168 > 79 characters)
Line 35:80: E501 line too long (211 > 79 characters)
Line 42:80: E501 line too long (135 > 79 characters)
Line 50:80: E501 line too long (104 > 79 characters)
Line 96:80: E501 line too long (112 > 79 characters)
Line 97:80: E501 line too long (112 > 79 characters)

In the file src/tools/__init__.py:

Line 1:80: E501 line too long (118 > 79 characters)
Line 3:71: W292 no newline at end of file

In the file src/weight/fixed-wing/Class1/class_i.py:

Line 223:18: E231 missing whitespace after ':'
Line 379:80: E501 line too long (128 > 79 characters)
Line 380:80: E501 line too long (97 > 79 characters)
Line 381:32: E127 continuation line over-indented for visual indent

In the file src/weight/fixed-wing/Class2/class_ii.py:

Line 2:10: E401 multiple imports on one line
Line 8:1: E402 module level import not at top of file
Line 11:1: E402 module level import not at top of file
Line 16:80: E501 line too long (130 > 79 characters)
Line 24:80: E501 line too long (94 > 79 characters)
Line 72:80: E501 line too long (108 > 79 characters)
Line 82:80: E501 line too long (100 > 79 characters)
Line 83:80: E501 line too long (117 > 79 characters)
Line 84:17: E122 continuation line missing indentation or outdented
Line 90:37: E231 missing whitespace after ','
Line 91:37: E231 missing whitespace after ','
Line 93:20: E231 missing whitespace after ','
Line 93:34: E231 missing whitespace after ','
Line 99:80: E501 line too long (94 > 79 characters)
Line 111:80: E501 line too long (91 > 79 characters)
Line 115:46: E231 missing whitespace after ','
Line 117:40: E231 missing whitespace after ','
Line 118:20: E231 missing whitespace after ','
Line 124:80: E501 line too long (82 > 79 characters)
Line 133:80: E501 line too long (102 > 79 characters)
Line 136:80: E501 line too long (99 > 79 characters)
Line 139:80: E501 line too long (82 > 79 characters)
Line 161:80: E501 line too long (105 > 79 characters)
Line 164:80: E501 line too long (109 > 79 characters)
Line 170:80: E501 line too long (104 > 79 characters)
Line 173:80: E501 line too long (142 > 79 characters)
Line 175:80: E501 line too long (96 > 79 characters)
Line 184:80: E501 line too long (92 > 79 characters)
Line 187:80: E501 line too long (100 > 79 characters)
Line 192:80: E501 line too long (102 > 79 characters)
Line 193:80: E501 line too long (129 > 79 characters)
Line 197:80: E501 line too long (134 > 79 characters)
Line 200:80: E501 line too long (84 > 79 characters)
Line 203:80: E501 line too long (94 > 79 characters)
Line 208:80: E501 line too long (163 > 79 characters)
Line 212:1: E303 too many blank lines (3)

In the file src/weight/fixed-wing/Class2/wing_sizing.py:

Line 2:10: E401 multiple imports on one line
Line 7:80: E501 line too long (111 > 79 characters)
Line 12:33: E231 missing whitespace after ','
Line 12:80: E501 line too long (116 > 79 characters)
Line 54:80: E501 line too long (141 > 79 characters)
Line 65:80: E501 line too long (143 > 79 characters)
Line 70:1: E303 too many blank lines (3)
Line 70:80: E501 line too long (158 > 79 characters)
Line 77:1: E265 block comment should start with '# '
Line 77:1: E303 too many blank lines (3)

In the file src/weight/fixed-wing/main.py:

Line 9:1: E402 module level import not at top of file
Line 128:80: E501 line too long (88 > 79 characters)
Line 141:22: E231 missing whitespace after ':'
Line 155:63: W605 invalid escape sequence '\D'
Line 155:80: E501 line too long (118 > 79 characters)
Line 172:80: E501 line too long (83 > 79 characters)

In the file src/weight/rotorcraft/rotor_weight_estimation.py:

Line 162:1: W293 blank line contains whitespace
Line 169:80: E501 line too long (83 > 79 characters)
Line 173:33: E231 missing whitespace after ','
Line 173:38: E231 missing whitespace after ','
Line 173:42: E261 at least two spaces before inline comment
Line 174:80: E501 line too long (82 > 79 characters)
Line 175:1: W293 blank line contains whitespace
Line 178:80: E501 line too long (84 > 79 characters)
Line 179:80: E501 line too long (80 > 79 characters)
Line 180:1: W293 blank line contains whitespace
Line 184:1: W293 blank line contains whitespace
Line 185:28: E231 missing whitespace after ','
Line 186:28: E231 missing whitespace after ','
Line 187:28: E231 missing whitespace after ','
Line 196:1: W293 blank line contains whitespace
Line 215:5: E113 unexpected indentation
Line 215:5: E303 too many blank lines (2)
Line 241:80: E501 line too long (80 > 79 characters)
Line 260:80: E501 line too long (90 > 79 characters)
Line 271:80: E501 line too long (112 > 79 characters)
Line 281:80: E501 line too long (108 > 79 characters)
Line 282:80: E501 line too long (112 > 79 characters)
Line 292:80: E501 line too long (87 > 79 characters)
Line 313:80: E501 line too long (97 > 79 characters)
Line 323:80: E501 line too long (80 > 79 characters)
Line 324:80: E501 line too long (83 > 79 characters)
Line 335:80: E501 line too long (83 > 79 characters)
Line 362:80: E501 line too long (88 > 79 characters)
Line 375:80: E501 line too long (107 > 79 characters)
Line 385:80: E501 line too long (98 > 79 characters)
Line 394:80: E501 line too long (81 > 79 characters)
Line 395:80: E501 line too long (134 > 79 characters)
Line 404:5: E303 too many blank lines (4)
Line 405:80: E501 line too long (80 > 79 characters)
Line 409:5: E303 too many blank lines (2)

In the file src/weight/rotorcraft/rotorcraft_size_visualisation.py:

Line 12:18: E231 missing whitespace after ','
Line 12:20: E231 missing whitespace after ','
Line 14:1: W391 blank line at end of file

Comment last updated at 2019-05-28 11:17:43 UTC

…rds to empty/full parameters and making fuel payload interchangeable)

…ght way.

…geable fuel and payload weight

LukeDeWaal and others added 7 commits May 15, 2019 09:01

Single Rotor Unittest Merge (#1)

98633a3

* More Tests * More unit tests * Single Rotor Tests Finished

comment edit

67255be

merge conflict

0bef6c0

Data kaman added

a94f512

Weight Estimation Main - v0.1

59e55c0

Merge branch 'master' of https://github.com/LukeDeWaal/DSE2019

3f87b5b

Performance Plots Added

c029c53

LukeDeWaal self-assigned this May 16, 2019

LukeDeWaal and others added 21 commits May 16, 2019 17:29

Performance Plots Added 2

0673730

Power And Weight Estimations Update

fab2727

Engine Selection and Weight Estimation

c42bcdd

Power Estimation

59b4603

Added the class for the wing weight.

53350b3

Merge branch 'master' of https://github.com/LukeDeWaal/DSE2019

f6d392c

Wing weight.

cba9066

Weight Estimation Finished

6d392dd

Midterm Update

1cdff82

COntrol Update

8ebe099

merge

c77d163

Euler Angles

8b18a3f

size visualisation

4bbb43d

Merge branch 'master' of github.com:LukeDeWaal/DSE2019

a79c059

CNS Update

05e5cdd

Merge branch 'master' of https://github.com/LukeDeWaal/DSE2019

28bbf32

Minor Updates; First attempt DriveLink

38e631a

gitignore

987530b

Merge branch 'master' of github.com:LukeDeWaal/DSE2019

924caf0

started fpp code

39082ac

Update .gitignore

5a24c46

Liesbeth Wijn and others added 30 commits June 12, 2019 13:53

waterimpact

13d4658

Merge3

aed3cd4

Merge3

06cce52

waterloads

3981369

waterloads

17b5a51

Merge4

a20db81

Merge4

03a0564

Fire Sim Added

00aac77

Added class II weight estimation, still needs optimisation (with rega…

9cac7f4

…rds to empty/full parameters and making fuel payload interchangeable)

Merge branch 'master' of github.com:LukeDeWaal/DSE2019

8a75cd5

Improvement on scissor plot, now fwd and aft cg are calculated the ri…

af441e7

…ght way.

Merge branch 'master' of https://github.com/LukeDeWaal/DSE2019

49b53e5

Added the floats to the cog calculations.

6caf8e1

FireSim Updates

354712f

Fixed 3d cg location error.

2d6849b

Cg plots now are more clear.

d20a641

Added package.

123d15c

..

a9ffcb0

..

03acd1b

Class II finalised, need to add variation of parameters and interchan…

0536b72

…geable fuel and payload weight

Merge branch 'master' of github.com:LukeDeWaal/DSE2019

9896cb0

graphs

83b2aca

Merge branch 'master' of https://github.com/LukeDeWaal/DSE2019

b46aa1a

Generating nice plots for fpp

35a53c7

Merge branch 'master' of github.com:LukeDeWaal/DSE2019

2c5aa92

graphs looking good

5e71fd3

Lots of new plots, mostly for Kars from Excel files

4343542

Bewaren voor Geert.

2a2ccc7

cred merge

255b433

New stress calculation with option for sensitivity analysis

547f00d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge Master Into Test Writing Branch #2

Merge Master Into Test Writing Branch #2

LukeDeWaal commented May 16, 2019

pep8speaks commented May 16, 2019 •

edited

Loading

Merge Master Into Test Writing Branch #2

Are you sure you want to change the base?

Merge Master Into Test Writing Branch #2

Conversation

LukeDeWaal commented May 16, 2019

pep8speaks commented May 16, 2019 • edited Loading

Comment last updated at 2019-05-28 11:17:43 UTC

pep8speaks commented May 16, 2019 •

edited

Loading