Complete 4b with comsuming equivalence

Author: hkchekc

compilef95.py

@@ -36,16 +36,37 @@
 # run_fortran(in_str)
 # get the arrays stored in specific text file
 #TODO: MAKE IT MORE GENERIC, SAVE IT TO A SPECIFIC FOLDER AND LOOP THROUGH ALL TXT FILE IN FOLDER
-arr_li = ['VFUNC', 'PFUNC', 'STATDIST', 'AGRID', 'LORENZ','LAMBDA']
+arr_li = ['VFUNC', 'PFUNC', 'STATDIST', 'AGRID', 'LORENZ','LAMBDA', 'VFUND', 'PFUND', 'Q', 'CONSUM_EQ']
 f_dict = dict()
+ps_spec_suffix = ""
 for c in arr_li:
+    c = c+ps_spec_suffix
     f = os.path.join(f_path, c)
     try:
         vf = np.transpose(np.genfromtxt(f))
     except OSError:
         vf = None
     f_dict[c] = vf
 
+#PS4B - GRAPHS
+# required_graph = ['VFUNC', 'PFUNC',  'VFUND', 'PFUND']
+# fig, axs = plt.subplots(2, 2)
+# order = [axs[0,0],axs[0,1],axs[1,0],axs[1,1]]
+# print(axs)
+# def_x = f_dict['AGRID']
+# colors = ['r', 'b', 'g', 'pink', 'c']
+# for i, item in enumerate(required_graph):
+#     g = f_dict[item]
+#     current_ax = order[i]
+#     print(current_ax)
+#     current_ax.set_title(item)
+#     for di, dim in enumerate(g):
+#         current_ax.plot(def_x, f_dict[item][di], colors[di])
+# plt.show()
+plt.plot( f_dict['AGRID'],f_dict['CONSUM_EQ'][2], 'r')
+plt.plot( f_dict['AGRID'],f_dict['CONSUM_EQ'][3], 'b')
+plt.show()
+
 # ps2 - PLOT GRAPHS
 # df1 = [f_dict['AGRID'][int(i-1)] for i in f_dict['PFUNC'][0]]
 # df2 = [f_dict['AGRID'][int(i-1)] for i in f_dict['PFUNC'][1]]
@@ -59,6 +80,6 @@
 # ozspace = np.linspace(0,1,100)
 # plt.plot(ozspace, f_dict['LORENZ'], 'r')
 # plt.plot(ozspace, ozspace, 'b')
-plt.plot( f_dict['AGRID'],f_dict['LAMBDA'][0], 'r')
-plt.plot( f_dict['AGRID'],f_dict['LAMBDA'][1], 'b')
-plt.show()
+# plt.plot( f_dict['AGRID'],f_dict['PFUNC'][0], 'r')
+# plt.plot( f_dict['AGRID'],f_dict['PFUNC'][1], 'b')
+# plt.show()

ps4.f95

@@ -7,7 +7,7 @@ MODULE PS4PARA
     REAL(KIND=8), DIMENSION(NZ, NZ), PARAMETER:: PI=TRANSPOSE(RESHAPE((/0.97, 0.03,0.5,0.5/),(/2,2/)))
     REAL(KIND=8), PARAMETER:: A_MIN=-2., A_MAX=5., STEPS=(A_MAX-A_MIN)/(FLOAT(NA)-1.)
     REAL(KIND=8), DIMENSION(NA), PARAMETER:: A_GRID=(/(I*STEPS, I=1, NA)/) + A_MIN - STEPS
-    LOGICAL:: COMPLETE=.TRUE. ! COMPLETE MARKET IF 1 OR INCOMPLETE MARKET IF 0
+    LOGICAL:: COMPLETE=.FALSE. ! COMPLETE MARKET IF 1 OR INCOMPLETE MARKET IF 0
 END MODULE
 
 MODULE PS4RES
@@ -216,24 +216,24 @@ SUBROUTINE WRITE_ALL()
     IMPLICIT NONE
     INTEGER:: SROWIDX
     INTEGER, DIMENSION(2):: SIDX
-    CHARACTER(LEN=130):: PATH="/Users/chek_choi/Downloads/fortran/"
+    CHARACTER(LEN=130):: PATH="./"
     CHARACTER(LEN=150):: FILE_NAME
 
-        FILE_NAME = TRIM(PATH)//"VALUEFUNC_COMPLETE"
+        FILE_NAME = TRIM(PATH)//"VFUNC"
         OPEN(UNIT=1, FILE=FILE_NAME, STATUS='REPLACE') ! START WITH THE TWO VALUE FUNCTIONS
         DO SROWIDX=1, NA
             WRITE(UNIT=1,FMT=*) VFUNC(SROWIDX,:)
         ENDDO
         CLOSE(UNIT=1)
 
-        FILE_NAME = TRIM(PATH)//"POLICYFUNC_COMPLETE"
+        FILE_NAME = TRIM(PATH)//"PFUNC"
         OPEN(UNIT=2, FILE=FILE_NAME, STATUS='REPLACE') ! ALSO SAVE POLICY FUNCTIONS
         DO SROWIDX=1, NA
             WRITE(UNIT=2,FMT=*) PFUNC(SROWIDX,:)
         ENDDO
         CLOSE(UNIT=2)
 
-        FILE_NAME = TRIM(PATH)//"STATDIST_COMPLETE"
+        FILE_NAME = TRIM(PATH)//"STATDIST"
         OPEN(UNIT=3, FILE=FILE_NAME, STATUS='REPLACE') ! ALSO SAVE POLICY FUNCTIONS
         DO SROWIDX=1, NA
             SIDX = (/SROWIDX*2-1, SROWIDX*2/)