diff --git a/SOCRATES b/SOCRATES index 7bcb846..bed7c81 100755 Binary files a/SOCRATES and b/SOCRATES differ diff --git a/SOCRATES.mlapp b/SOCRATES.mlapp index 3943d30..e5c0577 100644 Binary files a/SOCRATES.mlapp and b/SOCRATES.mlapp differ diff --git a/code/source/design.c b/code/source/design.c index d688433..6606359 100644 --- a/code/source/design.c +++ b/code/source/design.c @@ -2212,7 +2212,7 @@ void readSpDataNc(int iteration) int flagValid; // For RCG constraints double RCG_D, RCG_R, antGainD, antGainR; - double threshold_RCG_D[3] = {2.51353004264460e-15, 4.70350610913321e-16, 1.28655266830211e-16}; + //double threshold_RCG_D[3] = {2.51353004264460e-15, 4.70350610913321e-16, 1.28655266830211e-16}; struct DesignSoOpType *DS; // Grid struct EASEgridType *G; @@ -2431,20 +2431,15 @@ void readSpDataNc(int iteration) flagValid = FALSE; } else{ - //RCG_R = antGainR / (Design->accessRangeTS[iSp] + Design->accessRangeSR[iSp]) / (Design->accessRangeTS[iSp] + Design->accessRangeSR[iSp]); - + RCG_R = antGainR / (Design->accessRangeTS[iSp] + Design->accessRangeSR[iSp]) / (Design->accessRangeTS[iSp] + Design->accessRangeSR[iSp]); antGainD = cabs(Bistatic->g_rt[0][0])*cabs(Bistatic->g_rt[0][0]) * DS->G_Rx_num; RCG_D = antGainD / Design->accessRangeTR[iSp] / Design->accessRangeTR[iSp]; - //if(RCG_D > Design->minDirectRCG){ // Constraint 1 - //if(fabs(10*log10(RCG_D) - 10*log10(RCG_R)) < Design->maxRCGdiff) // Constraint 2 - if(RCG_D > threshold_RCG_D[iSoOp]) + //if(RCG_D > threshold_RCG_D[iSoOp]) + if(fabs(10*log10(RCG_D) - 10*log10(RCG_R)) < Design->maxRCGdiff) flagValid = TRUE; else flagValid = FALSE; - //} - //else - // flagValid = FALSE; } // Sort data into a grid diff --git a/code/source/matlab/app/missionDesigner.mlapp b/code/source/matlab/app/missionDesigner.mlapp index e2d1af2..5a337d0 100644 Binary files a/code/source/matlab/app/missionDesigner.mlapp and b/code/source/matlab/app/missionDesigner.mlapp differ diff --git a/doc/SOCRATES_User_Manual.pdf b/doc/SOCRATES_user_manual.pdf similarity index 98% rename from doc/SOCRATES_User_Manual.pdf rename to doc/SOCRATES_user_manual.pdf index ae7988a..b3ac5d5 100644 Binary files a/doc/SOCRATES_User_Manual.pdf and b/doc/SOCRATES_user_manual.pdf differ