summaryrefslogtreecommitdiff
path: root/graphics/ketcindy/ketcindyfolder/scripts/ketlib/ketpiccurrent.r
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/ketcindy/ketcindyfolder/scripts/ketlib/ketpiccurrent.r')
-rw-r--r--graphics/ketcindy/ketcindyfolder/scripts/ketlib/ketpiccurrent.r20
1 files changed, 12 insertions, 8 deletions
diff --git a/graphics/ketcindy/ketcindyfolder/scripts/ketlib/ketpiccurrent.r b/graphics/ketcindy/ketcindyfolder/scripts/ketlib/ketpiccurrent.r
index 76998cc41d..129d9f0a42 100644
--- a/graphics/ketcindy/ketcindyfolder/scripts/ketlib/ketpiccurrent.r
+++ b/graphics/ketcindy/ketcindyfolder/scripts/ketlib/ketpiccurrent.r
@@ -16,10 +16,14 @@
#########################################
-ThisVersion<- "KeTpic for R v5_2_4(20190921)"
+ThisVersion<- "KeTpic for R v5_2_4(20191126)"
print(ThisVersion)
+# 20191126
+# Drwpt debugge/changed (sh 1, pen)
+# 20191001
+# Intersectpartseg, Enclosing2 debugged (Listplot => rbind)
# 20190921
# Enclosing2 debugged/changed (epspara removed)
# 20190627
@@ -2476,14 +2480,14 @@ Drwpt<-function(...){
}
Mojisu=0
}
- Str1<- "\\special{sh}\\special{fp}" #190405from
+ Str1<- "\\special{sh 1}\\special{fp}" #190405from, 191126
if(Same=="n"){
Str1<- paste(Str1,"}",sep="")
}
Str1<- paste(Str1,"%\n",sep="") #190405to
cat(Str1,file=Wfile,append=TRUE)
}
- cat("\\special{pn 4}",file=Wfile,append=TRUE) #181231
+ cat("\\special{pn 8}",file=Wfile,append=TRUE) #181231,191126
Mojisu=0
for (J in 1:Nrow(PL)){
Q<- PL[J,]
@@ -12685,8 +12689,8 @@ Intersectpartseg<- function(...){
Eps00=10^(-8)
Eps0=10^(-4)
out=list()
- seg1=Listplot(Op(ii,crv1),Op(ii+1,crv1))
- seg2=Listplot(Op(jj,crv2),Op(jj+1,crv2))
+ seg1=rbind(Op(ii,crv1),Op(ii+1,crv1)) #191001
+ seg2=rbind(Op(jj,crv2),Op(jj+1,crv2)) #191001
tmp1=Op(2,seg1)-Op(1,seg1)
tmp2=Op(2,seg2)-Op(1,seg2)
snang=abs(Crossprod(tmp1,tmp2))/(Norm(tmp1)*Norm(tmp2))
@@ -12741,8 +12745,8 @@ Intersectpartseg<- function(...){
tmp2=list()
for(kk in Looprange(1,Length(os1)-1)){
for(ll in Looprange(1,Length(os2)-1)){
- seg1=Listplot(Op(kk,os1),Op(kk+1,os1))
- seg2=Listplot(Op(ll,os2),Op(ll+1,os2))
+ seg1=rbind(Op(kk,os1),Op(kk+1,os1)) #191001
+ seg2=rbind(Op(ll,os2),Op(ll+1,os2)) #191001
tmp=Intersectseg(seg1,seg2,Eps1)
if((Op(1,tmp)<Eps1)&&(length(tmp)>1)){ #18.02.05
if(Op(1,tmp)<dst+Eps00){
@@ -13055,7 +13059,7 @@ Enclosing2<- function(...){
if(length(KL)==0){
tmp1=Op(Length(Gdata),Gdata)
tmp2=Op(1,Fdata)
- tmp=Listplot(tmp1,tmp2)
+ tmp=rbind(tmp1,tmp2) #191001
plist=c(plist,list(tmp))
Start=tmp2
tst=1