Skip to content

Remaining PType and TPath changes (no ExpAsset)#78

Open
MichaelTiemann wants to merge 2 commits intovfitoolkit:masterfrom
MichaelTiemann:remaining-ptype-changes
Open

Remaining PType and TPath changes (no ExpAsset)#78
MichaelTiemann wants to merge 2 commits intovfitoolkit:masterfrom
MichaelTiemann:remaining-ptype-changes

Conversation

@MichaelTiemann
Copy link
Copy Markdown
Contributor

These are the non-ExpAsset changes needed thus far to progress a model through all the ptype and tpath things I have encountered.

These are the non-ExpAsset changes needed thus far to progress a model through all the ptype and tpath things I have encountered.
@MichaelTiemann
Copy link
Copy Markdown
Contributor Author

May need to watch out for this:

<<<<<<< mixed-horizon-tpath
                V_final.(iistr)=reshape(permute(reshape(V_final.(iistr),[N_a,N_e,N_j_temp]),[1,3,2]),[N_a*N_j_temp,N_e]);
            end
        else
            if N_e==0
                V_final.(iistr)=reshape(permute(reshape(V_final.(iistr),[N_a,N_z,N_j_temp]),[1,3,2]),[N_a*N_j_temp,N_z]);
            else
                V_final.(iistr)=reshape(permute(reshape(V_final.(iistr),[N_a,N_z,N_e,N_j_temp]),[1,4,2,3]),[N_a*N_j_temp,N_z,N_e]);
            end
        end
    end
    % Reshape AgentDist_init and turn AgeWeights_T into appropriate size so that we can always just do AgentDist.*AgeWeights
=======
                V_final.(iistr)=reshape(permute(V_final.(iistr),[1,3,2]),[N_a*N_j_temp,N_e]);
            end
        else
            if N_e==0
                V_final.(iistr)=reshape(permute(V_final.(iistr),[1,3,2]),[N_a*N_j_temp,N_z]);
            else
                V_final.(iistr)=reshape(permute(V_final.(iistr),[1,4,2,3]),[N_a*N_j_temp,N_z,N_e]);
            end
        end
    end
    % Reshape AgentDist_initial and turn AgeWeights_T into appropriate size so that we can always just do AgentDist.*AgeWeights
>>>>>>> remaining-ptype-changes

@MichaelTiemann
Copy link
Copy Markdown
Contributor Author

Another thing to watch for: in order to run my model in the TPath section, I needed to un-hardcode fastOLG=1 in simoptions. I think these changes have all the bits needed to work, but if there are problems, I can cherry-pick from the ExpAsset changes (that are much more extensive in the fastOLG sections). The bottom line is that I do have all the changes needed to get to the new known functional horizon, but I might not have split it perfectly down the middle. We'll see.

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.

1 participant