96 lines
3.2 KiB
Text
96 lines
3.2 KiB
Text
$NetBSD: patch-ab,v 1.3 2005/11/03 19:56:36 rillig Exp $
|
|
|
|
--- src/main.cc.orig 1998-12-10 10:56:19.000000000 +0000
|
|
+++ src/main.cc
|
|
@@ -1,6 +1,7 @@
|
|
/* Main program, prints out all the results */
|
|
/* written and modified by Emre Tuncer and Sangwoo Kim */
|
|
-#include <fstream.h>
|
|
+#include <iostream>
|
|
+#include <fstream>
|
|
#include <stdlib.h>
|
|
#include <math.h>
|
|
#include <stdio.h>
|
|
@@ -42,7 +43,7 @@ main(int argc,char** argv)
|
|
printf("\n");
|
|
start=time(NULL);
|
|
if (argc!=3) {
|
|
- cerr << "Usage: " << argv[0] <<
|
|
+ std::cerr << "Usage: " << argv[0] <<
|
|
" <input file> <w/r>\n";
|
|
exit(1);
|
|
}
|
|
@@ -73,7 +74,7 @@ main(int argc,char** argv)
|
|
Nf=nf[Nc+1];
|
|
LastFil(fils); //remove last empty entry.
|
|
// Corr(fils); /* x1 < x2 */
|
|
- printf("Total %ld ribbons, %ld conductor\n",Nf,Nc);
|
|
+ printf("Total %d ribbons, %d conductor\n",Nf,Nc);
|
|
L=allocator(Nf);
|
|
|
|
if (argv[2][0]=='w') {
|
|
@@ -84,7 +85,7 @@ main(int argc,char** argv)
|
|
for (j=i;j<Nf;j++) {
|
|
L[j][i]=L[i][j]=Lp(iF,jF);
|
|
jF=jF->next;
|
|
- fprintf(fo,"%ld %ld %le\n",i,j,L[i][j]*sis->unit);
|
|
+ fprintf(fo,"%d %d %e\n",i,j,L[i][j]*sis->unit);
|
|
}
|
|
iF=iF->next;
|
|
}
|
|
@@ -96,7 +97,7 @@ main(int argc,char** argv)
|
|
fi=fopen("induc","r");
|
|
for (i=0;i<Nf;i++) {
|
|
for (j=i;j<Nf;j++) {
|
|
- fscanf(fi,"%ld %ld %le\n",&k,&k,&L[i][j]);
|
|
+ fscanf(fi,"%d %d %le\n",&k,&k,&L[i][j]);
|
|
L[i][j]/=sis->unit;
|
|
L[j][i]=L[i][j];
|
|
}
|
|
@@ -114,7 +115,7 @@ main(int argc,char** argv)
|
|
stop= time(NULL);
|
|
printf("\n");
|
|
printf("*********** \n");
|
|
- printf("Total Elapsed time=%ld Seconds\n",(stop-start));
|
|
+ printf("Total Elapsed time=%ld Seconds\n",(long int) (stop-start));
|
|
exit(1);
|
|
}
|
|
Z=matrix(Nf,Nf);
|
|
@@ -143,11 +144,11 @@ main(int argc,char** argv)
|
|
if ((sis->loop != 0) || (Nc==1)){
|
|
z=matrix(Nc,Nc);
|
|
z=inverse(ymtrx,Nc);
|
|
- fprintf(fzs,"\nImpedance %ld x %ld matrix (R,L) at f=%10.4le Hz\n",
|
|
+ fprintf(fzs,"\nImpedance %d x %d matrix (R,L) at f=%10.4e Hz\n",
|
|
Nc,Nc,w/2/M_PI);
|
|
for (i=0;i<Nc;i++) {
|
|
for (j=0;j<Nc;j++) {
|
|
- fprintf(fzs,"(%11.4le,%11.4le) ",RE(z[i][j])*sis->unit,IM(z[i][j])
|
|
+ fprintf(fzs,"(%11.4e,%11.4e) ",RE(z[i][j])*sis->unit,IM(z[i][j])
|
|
/w*sis->unit);
|
|
}
|
|
fprintf(fzs,"\n");
|
|
@@ -181,12 +182,12 @@ main(int argc,char** argv)
|
|
|
|
Din=matrix(numsgn+1,numsgn+1);
|
|
Din=Zequ(cons,numsgn,Nc);
|
|
- fprintf(fzs,"\nImpedance %ld x %ld matrix (R,L) at f=%10.4le Hz\n",
|
|
+ fprintf(fzs,"\nImpedance %d x %d matrix (R,L) at f=%10.4e Hz\n",
|
|
numsgn,numsgn,w/2/M_PI);
|
|
|
|
for (i=0;i<numsgn;i++) {
|
|
for (j=0;j<numsgn;j++) {
|
|
- fprintf(fzs,"(%11.4le,%11.4le) ",RE(Din[i][j])*sis->unit,IM(Din[i][j])
|
|
+ fprintf(fzs,"(%11.4e,%11.4e) ",RE(Din[i][j])*sis->unit,IM(Din[i][j])
|
|
/w*sis->unit);
|
|
}
|
|
fprintf(fzs,"\n");
|
|
@@ -199,7 +200,7 @@ main(int argc,char** argv)
|
|
stop= time(NULL);
|
|
printf("\n");
|
|
printf("*********** \n");
|
|
- printf("Total Elapsed time=%ld Seconds\n",(stop-start));
|
|
+ printf("Total Elapsed time=%ld Seconds\n",(long int) (stop-start));
|
|
exit(0);
|
|
}
|
|
|