Merge pull request #19 from tshort/tabs

Replace tabs with two spaces

Author: HildingElmqvist

examples/CauerLowPassFilter.jl

@@ -71,7 +71,7 @@ using Modia.Electric
 #  V=StepVoltage(startTime=10, V=1)
   V=ConstantVoltage(V=1)
   Ground1=Ground()
-	obs=Float(start=0.0)
+  obs=Float(start=0.0)
 @equations begin 
   connect(Op1.in_p, G.p) 
   connect(G1.p, Op2.in_p) 
@@ -138,7 +138,7 @@ using Modia.Electric
   connect(Op5.in_p, G4.p) 
   connect(V.p, Ground1.p)            
   connect(V.n, R1.p)  
-	der(obs) = 100000*(Op5.out.v-obs)
+  der(obs) = 100000*(Op5.out.v-obs)
   end
 end
 

examples/SynchronousExamples.jl

@@ -13,12 +13,12 @@ using Base.Test
   a = Var(size=())
   b = Var(size=())
   c = Var(start=0.0)
-	obs=Float(start=0.0)  
+  obs=Float(start=0.0)  
 @equations begin
   a = Clock(0.1)
   b = sample(time, a)
   c = previous(c, a) + 0.5
-	der(obs) = 1000000*(c-obs)
+  der(obs) = 1000000*(c-obs)
   end
 end
 
@@ -48,7 +48,7 @@ end
   vref = 100 # Speed ref.
   vd=Float(start=0.0)
   u=Float(start=0.0)
-	fobs=Float(start=0.0)
+  fobs=Float(start=0.0)
 @equations begin
   # speed sensor
   vd = sample(v, Clock(0.1))
@@ -58,7 +58,7 @@ end
 
   # force actuator
   f = hold(u)
-	der(fobs) = 1000000*(f-fobs)
+  der(fobs) = 1000000*(f-fobs)
   end
 end 
 
@@ -70,27 +70,27 @@ plot(result, ("v", "fobs"), figure=1, heading="SpeedControl", figure=15)
   @extends MassWithSpringDamper(k=0)
   @inherits v, f
   K = 2 # Gain of speed P controller
-	Ti = 2 # Integral time 
+  Ti = 2 # Integral time 
   vref = 100 # Speed reference
   dt=0.1 # sampling interval
   vd=Float()
   u=Float(start=0)
-	e=Float()
-	intE=Float(start=0)
-		
-	fobs=Float(start=0.0)
+  e=Float()
+  intE=Float(start=0)
+    
+  fobs=Float(start=0.0)
 @equations begin
   # speed sensor
   vd = sample(v, Clock(dt))
 
   # PI controller for speed
-	e = vref-vd
-	intE = previous(intE, Clock(dt)) + e
+  e = vref-vd
+  intE = previous(intE, Clock(dt)) + e
   u = K*(e + intE/Ti)
 
   # force actuator
   f = hold(u)
-	der(fobs) = 1000000*(f-fobs)
+  der(fobs) = 1000000*(f-fobs)
   end
 end 
 
@@ -113,7 +113,7 @@ plot(result, ("v", "fobs"), figure=1, heading="SpeedControlPI", figure=16)
   vd=Float(size=())
   vref=Float(size=())
   uInner=Float(start=0.0)
-	fobs=Float(start=1990)
+  fobs=Float(start=1990)
 @equations begin
   # position sensor
   xd = sample(x, Clock(0.02))
@@ -128,7 +128,7 @@ plot(result, ("v", "fobs"), figure=1, heading="SpeedControlPI", figure=16)
   uInner = KInner*(vref-vd)
   # force actuator
   f = hold(uInner)
-	der(fobs) = 100000*(f-fobs)
+  der(fobs) = 100000*(f-fobs)
   end
 end
 
@@ -139,36 +139,36 @@ end
 @model DiscretePIController begin
   K=0.1 # Gain 
   Ti=1E10 # Integral time 
-	dt=1.0 # sampling interval
+  dt=1.0 # sampling interval
   ref=1 # set point
-	u=Float(); ud=Float(size=())
-	y=Float(); yd=Float(size=())
+  u=Float(); ud=Float(size=())
+  y=Float(); yd=Float(size=())
   e=Float(size=())
   intE=Float(start=0)
 
-	fobs=Float(start=0)
+  fobs=Float(start=0)
 @equations begin
   # sensor
   ud = sample(u, Clock(dt))
-	# PI controller
+  # PI controller
   e = ref-ud
   intE = previous(intE, Clock(dt)) + e
   yd = K*(e + intE/Ti)
   # actuator
   y = hold(yd)
-	
-	der(fobs) = 100000*(y-fobs)
+  
+  der(fobs) = 100000*(y-fobs)
   end
 end
 
 
 @model SpeedControl2 begin
   m=MassWithSpringDamper(d=0.5, k=0)
-	c=DiscretePIController(K=2, dt=0.1)
+  c=DiscretePIController(K=2, dt=0.1)
 @equations begin
   connect(m.v, c.u)
-	connect(c.y, m.f)
-	end
+  connect(c.y, m.f)
+  end
 end
 
 #result = simulate(SpeedControl2, 5.0, storeEliminated=false, logSimulation=true)
@@ -177,12 +177,12 @@ end
 
 @model SpeedControl3 begin
   m=MassWithSpringDamper(d=0.5, k=0)
-	@extends DiscretePIController(K=2, dt=0.1)
-	@inherits u, y, dt, e, intE
+  @extends DiscretePIController(K=2, dt=0.1)
+  @inherits u, y, dt, e, intE
 @equations begin
   u = m.v
-	m.f = y
-	end
+  m.f = y
+  end
 end
 
 #result = simulate(SpeedControl3, 5.0, storeEliminated=false, logSimulation=true)

src/language/Execution.jl

@@ -818,9 +818,9 @@ makeJSON(ex) = get(operator_table, string(ex), string(ex))
 function makeJSON(ex::Array{Any})
   [makeJSON(e) for e in ex]
 end
-
+  
 function makeJSON(ex::Expr)
-	if isexpr(ex, :quote) || isexpr(ex, :line)
+  if isexpr(ex, :quote) || isexpr(ex, :line)
     nothing
   elseif isexpr(ex, :block)
     makeJSON(ex.args[2])

src/language/Instantiation.jl

@@ -971,7 +971,7 @@ prettyfy(get::GetField) = Symbol(replace(string(get.name), ".", "_")) # get.name
 #prettyfy(s::Symbol) = s
 prettyfy(ex) = ex
 function prettyfy(ex::Expr)
-	if isexpr(ex, :quote) || isexpr(ex, :line)
+  if isexpr(ex, :quote) || isexpr(ex, :line)
     nothing
   elseif isexpr(ex, :block)
     prettyfy(ex.args[2])
@@ -995,10 +995,10 @@ Array{Any}
 function prettyPrint(e::Expr)
     ex = prettyfy(e)
     if ex.head === :quote
-      return ex
-		elseif ex.head === :(:=)
-      return string(prettyPrint(ex.args[1]), " := ", prettyPrint(ex.args[2]))
-		end
+        return ex
+    elseif ex.head === :(:=)
+        return string(prettyPrint(ex.args[1]), " := ", prettyPrint(ex.args[2]))
+    end
     Expr(ex.head, [prettyPrint(arg) for arg in ex.args]...)
 end
 

src/models/Blocks.jl

@@ -78,10 +78,10 @@ end
   height=1      # Height of step
   @extends SignalSource()
   @inherits y, offset, startTime
-	t = Float(start=0.0)
+  t = Float(start=0.0)
 @equations begin 
   y = offset + (t < startTime ? 0 : height)
-	der(t) = 1
+  der(t) = 1
   end
 end
 
@@ -94,11 +94,11 @@ end
   startTime=0   # Output y = offset for time < startTime
   @extends SO()
   @inherits y
-	t = Float(start=0.0)
+  t = Float(start=0.0)
 @equations begin 
 #  y = offset + if time < startTime;  0 else amplitude*sin(2*pi*freqHz*(time - startTime) + phase) end
   y = offset + if t < startTime;  0 else amplitude*sin(2*pi*freqHz*(t - startTime) + phase) end
-	der(t) = 1
+  der(t) = 1
   end
 end
 

src/models/Rotational.jl

@@ -68,7 +68,7 @@ end
   @extends PartialCompliant(phi_rel=Float(size=(), state=false))
   @inherits tau, phi_rel
   c=Parameter(min=0, start=1.0e5)       # Spring constant
-	d=Parameter()
+  d=Parameter()
   phi_rel0=0   # Unstretched spring angle
 @equations begin 
   tau = c*(phi_rel - phi_rel0) + d*der(phi_rel)
@@ -82,7 +82,7 @@ end
   p=Pin()
   n=Pin()
   flange=Flange()
-	
+  
   v=Float(size=())
   i=Float(size=())
   phi=Float(state=false, size=())