ketcindy (27sep19)

git-svn-id: svn://tug.org/texlive/trunk@52190 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 23 insertions, 24 deletions

diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r
index be7bba6346f..76998cc41d6 100755
--- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r
+++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent.r
@@ -16,10 +16,14 @@
 
 #########################################
 
-ThisVersion<- "KeTpic for R  v5_2_4(20190511)" 
+ThisVersion<- "KeTpic for R  v5_2_4(20190921)" 
 
 print(ThisVersion)
 
+# 20190921
+#   Enclosing2 debugged/changed  (epspara removed)
+# 20190627
+#   Plotdata, Paramplot debugged (Exc)
 # 20190511
 #   Implicitplot changed  (Eps=> 10^(-6))
 # 20190508
@@ -5411,10 +5415,14 @@ Paramplot<- function(...)
       }
     }
   }
+  Tmp<- Nrow(P) #190627from
+  Tmp1<- Op(1,P)
+  if(Tmp1[1]==Inf){
+    P<- P[2:Tmp,]
+  } #190627to
   Tmp<- Nrow(P)
   Tmp1<- Op(Tmp,P)
-  if(Tmp1[1]==Inf)
-  {
+  if(Tmp1[1]==Inf){
     P<- P[1:(Tmp-1),]
   }
   return(P)
@@ -5611,10 +5619,14 @@ Plotdata<- function(...)
       }
     }
   }
+  Tmp<- Nrow(P) #190627from
+  Tmp1<- P[1,]
+  if(Tmp1[1]==Inf){
+    P<- P[2:Tmp,]
+  } #190627to
   Tmp<- Nrow(P)
-  Tmp1<-P[Tmp,]
-  if(Tmp1[1]==Inf)
-  {
+  Tmp1<- P[Tmp,]
+  if(Tmp1[1]==Inf){
     P<- P[1:(Tmp-1),]
   }
   return(P)
@@ -13009,7 +13021,6 @@ Enclosing2<- function(...){
   Nargs=length(varargin)
   plist=varargin[[1]]
   Eps0=10^(-5)
-  epspara=1; #180707
   Eps1=0.01
   Eps2=0.1
   Start=c()
@@ -13019,9 +13030,8 @@ Enclosing2<- function(...){
     if(length(tmp)>1){
       Start=tmp
     }else{
-     if(flg==0){epspara=tmp}
-     if(flg==1){Eps1=tmp}
-     if(flg==2){Eps2=tmp}
+     if(flg==0){Eps1=tmp}
+     if(flg==1){Eps2=tmp}
      flg=flg+1
     }
   }
@@ -13105,19 +13115,8 @@ Enclosing2<- function(...){
         t2=Length(Fdata)
         ss=1 #18.02.02to
       }else{
-#        KL=Quicksort(KL,2); #180706from
-#        for(j in Looprange(1,length(KL))){
-#          tmp1=t1+epspara/50*Length(Fdata)#180713(2lines)
-#          tmp2=Op(2,KL[[j]])
-#          if((tmp2>tmp1)||((tmp2>t1)&&(Norm(Op(3,KL[[j]])-p1)>Eps1))){
-#            break
-#          } #180711,16
-#        }
-#        t2=Op(2,KL[[j]])
-#        p2=Pointoncurve(t2,Fdata)#180713
-#        ss=Op(3,KL[[j]])# 180706to
-		tmp=c()  #180711from
-        for(j in Looprange(1,length(KL))){
+        tmp=c(Op(2,KL[[1]]))  #180711from #190921
+        for(j in Looprange(2,length(KL))){
           tmp=c(tmp,Op(2,KL[[j]]))
         }
         tmp1=order(tmp)
@@ -13125,7 +13124,7 @@ Enclosing2<- function(...){
         KL=list()
         for(j in tmp1){
           tmp=tmp2[[j]]
-          tmp3=t1+epspara/50*Length(Fdata)
+          tmp3=t1+Eps0
           tmp4=Op(2,tmp)
           if((tmp4>tmp3)||((tmp4>t1)&&(Norm(Op(1,tmp)-p1)>Eps1))){
             KL=c(KL,list(tmp))