Insert new equations #128
Merged
Insert new equations #128
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
natema
approved these changes
Oct 20, 2022
| @@ -591,7 +604,110 @@ end | |||
| sustain output, and industrial output per capita IOPC continues to grow | |||
| indefinitely. | |||
| """ | |||
| fig_23(; kwargs...) = @info "This figure is not implemented yet." | |||
There was a problem hiding this comment.
Checked: output corresponds with the book ✔️
Comment on lines
+208
to
+213
| @test isa(World3.fig_23(), PlotlyJS.SyncPlot) | ||
| @test isa(World3.fig_24(), PlotlyJS.SyncPlot) | ||
| @test isa(World3.fig_26(), PlotlyJS.SyncPlot) | ||
| @test isa(World3.fig_27(), PlotlyJS.SyncPlot) | ||
| @test isa(World3.fig_30(), PlotlyJS.SyncPlot) | ||
| @test isa(World3.fig_32(), PlotlyJS.SyncPlot) |
There was a problem hiding this comment.
✔️ the type of all modified figures is tested.
| @@ -606,7 +722,43 @@ fig_23(; kwargs...) = @info "This figure is not implemented yet." | |||
| improvements rise continuously at 4 percent per year. Growth is maintained through the year 2100 because of the absence of significant delays | |||
| and costs in the development of new technologies. | |||
| """ | |||
| fig_24(; kwargs...) = @info "This figure is not implemented yet." | |||
| function fig_24(; kwargs...) | |||
There was a problem hiding this comment.
Generated plot corresponds with the book ✔️
| @@ -618,7 +770,76 @@ fig_24(; kwargs...) = @info "This figure is not implemented yet." | |||
| unable to avoid the effects of the constraints to growth because industrial | |||
| output per capita IOPC and population POP grow faster than the maximum rate of technological change. In this run, resource depletion again halts growth in population and industrial output. | |||
| """ | |||
| fig_26(; kwargs...) = @info "This figure is not implemented yet." | |||
| function fig_26(; kwargs...) | |||
There was a problem hiding this comment.
Generated plot corresponds with the book ✔️
| @@ -826,4 +1352,72 @@ fig_39(; kwargs...) = @info "This figure is not implemented yet." | |||
| World3; therefore, the policies that led to equilibrium 25 years earlier are | |||
| no longer effective. | |||
| """ | |||
| fig_41(; kwargs...) = @info "This figure is not implemented yet." | |||
| function fig_41(; kwargs...) | |||
There was a problem hiding this comment.
Generated plot corresponds with the book ✔️
| @@ -815,7 +1286,62 @@ end | |||
| with social policies that stabilize population POP and industrial output | |||
| per capita IOPC. The technological advances in recycling, pollution control , and land yields are assumed to be effective only after a delay and to require capital for their development and implementation. As in the adaptive technological runs described in section 7.5, additional technologies are assumed to be implemented in 1975. These policies lower resource costs, decrease the effects of air pollution, and reduce land erosion. The resulting model behavior reaches equilibrium because the stable population and capital reduce the need for new technologies. Thus the newly implemented technologies are less costly, and the delays in their development and implementation are less critical to their effectiveness. | |||
| """ | |||
| fig_39(; kwargs...) = @info "This figure is not implemented yet." | |||
| function fig_39(; kwargs...) | |||
There was a problem hiding this comment.
Generated plot does NOT correspond with the book, but see #67
| @@ -663,7 +1085,57 @@ fig_30(; kwargs...) = @info "This figure is not implemented yet." | |||
| in the short run but counterproductive in the long run: the failure to implement the new technologies causes a significant depletion of resources | |||
| and growth is ultimately terminated. | |||
| """ | |||
| fig_32(; kwargs...) = @info "This figure is not implemented yet." | |||
| function fig_32(; kwargs...) | |||
There was a problem hiding this comment.
Generated plot corresponds with the book ✔️
| @@ -646,7 +1004,71 @@ fig_27(; kwargs...) = @info "This figure is not implemented yet." | |||
| output per capita IOPC to decline. The added costs incurred by the continued implementation of new technologies even after IOPC has peaked | |||
| force IOPC to fall more precipitously than in Run 7-21. | |||
| """ | |||
| fig_30(; kwargs...) = @info "This figure is not implemented yet." | |||
| function fig_30(; kwargs...) | |||
There was a problem hiding this comment.
Besides some bumps related to #79, the generated plot corresponds with the book ✔️
| @@ -632,7 +853,144 @@ fig_26(; kwargs...) = @info "This figure is not implemented yet." | |||
| growth possible. The rising costs of the new technologies cause industrial | |||
| output per capita IOPC to decline after the year 2010. | |||
| """ | |||
| fig_27(; kwargs...) = @info "This figure is not implemented yet." | |||
| function fig_27(; kwargs...) | |||
There was a problem hiding this comment.
Generated plot corresponds with the book ✔️
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #73