-
Notifications
You must be signed in to change notification settings - Fork 31
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
Feat/context/time #739
Merged
Merged
Feat/context/time #739
Commits on Mar 20, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 7714d76 - Browse repository at this point
Copy the full SHA 7714d76View commit details -
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
…Link into feat/context/time
Configuration menu - View commit details
-
Copy full SHA for 8b757de - Browse repository at this point
Copy the full SHA 8b757deView commit details -
Configuration menu - View commit details
-
Copy full SHA for acc8952 - Browse repository at this point
Copy the full SHA acc8952View commit details -
- removed region/endregion annotations • Projection - _execute now calls super() • States - all subclasses now call super()_execute rather than function directly (so that increment_execution_count and current_execution_time can be called on Component) • Log _get_time: now gets system directly from ref_mech.context.composition
Configuration menu - View commit details
-
Copy full SHA for 26b0eaf - Browse repository at this point
Copy the full SHA 26b0eafView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4063e74 - Browse repository at this point
Copy the full SHA 4063e74View commit details
Commits on Mar 21, 2018
-
Configuration menu - View commit details
-
Copy full SHA for ca30218 - Browse repository at this point
Copy the full SHA ca30218View commit details -
- current_execution_time: implemented - _update_current_execution_time(): implemented • Mechanism attributes_dict: added EXECUTION_TIME
Configuration menu - View commit details
-
Copy full SHA for 4183d7a - Browse repository at this point
Copy the full SHA 4183d7aView commit details -
Merge branches 'devel' and 'feat/context/time' of https://github.com/…
…PrincetonUniversity/PsyNeuLink into feat/context/time
Configuration menu - View commit details
-
Copy full SHA for 97e01dc - Browse repository at this point
Copy the full SHA 97e01dcView commit details -
- docstring revs to user_params, and added execution_count and current_execution_time
Configuration menu - View commit details
-
Copy full SHA for a48d172 - Browse repository at this point
Copy the full SHA a48d172View commit details -
- docstring revs to user_params, and added execution_count and current_execution_time • Mechanism - docstring revs added attribute_dict
Configuration menu - View commit details
-
Copy full SHA for c152ccd - Browse repository at this point
Copy the full SHA c152ccdView commit details -
Merge branches 'devel' and 'feat/context/time' of https://github.com/…
…PrincetonUniversity/PsyNeuLink into feat/context/time
Configuration menu - View commit details
-
Copy full SHA for bcd690d - Browse repository at this point
Copy the full SHA bcd690dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ef01d2 - Browse repository at this point
Copy the full SHA 0ef01d2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2a5930d - Browse repository at this point
Copy the full SHA 2a5930dView commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.