From: WANG Date: Mon, 26 Aug 2013 14:37:31 +0000 (+0200) Subject: Erosion and dilation algorithme successfully tested. X-Git-Url: https://svn.cri.ensmp.fr/git/Faustine.git/commitdiff_plain/fb68e6e549e4b9bfd6c7a98297f5993770fad640?hp=-c Erosion and dilation algorithme successfully tested. --- fb68e6e549e4b9bfd6c7a98297f5993770fad640 diff --git a/interpretor/basic.ml b/interpretor/basic.ml index 1e56142..ae096af 100644 --- a/interpretor/basic.ml +++ b/interpretor/basic.ml @@ -398,3 +398,39 @@ let basic_smaller : basic -> basic -> basic = basic_larger_than_zero (b2 -~ b1);; +let basic_max : basic -> basic -> basic = + fun b1 -> + fun b2 -> + let compare = basic_larger_than_zero (b1 -~ b2) in + match compare with + | N i -> + if i = 1 then b1 + else if i = 0 then b2 + else raise (Basic_operation "compare result not bool.") + | Vec vec -> + let basics = Array.init vec#size vec#nth in + let sum = basic_to_int (Array.fold_left basic_add Zero basics) in + if sum = vec#size then b1 + else if sum = 0 then b2 + else Error + | Error -> Error + | _ -> raise (Basic_operation "compare result not bool.");; + + +let basic_min : basic -> basic -> basic = + fun b1 -> + fun b2 -> + let compare = basic_larger_than_zero (b1 -~ b2) in + match compare with + | N i -> + if i = 1 then b2 + else if i = 0 then b1 + else raise (Basic_operation "compare result not bool.") + | Vec vec -> + let basics = Array.init vec#size vec#nth in + let sum = basic_to_int (Array.fold_left basic_add Zero basics) in + if sum = vec#size then b2 + else if sum = 0 then b1 + else Error + | Error -> Error + | _ -> raise (Basic_operation "compare result not bool.");; diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/OSCControler.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/OSCControler.o index c1e1398..5d05790 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/OSCControler.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/OSCControler.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/lib/OSCFError.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/lib/OSCFError.o index d0f15ae..887272d 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/lib/OSCFError.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/lib/OSCFError.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/lib/OSCRegexp.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/lib/OSCRegexp.o index 65366f4..5f8ee04 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/lib/OSCRegexp.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/lib/OSCRegexp.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/msg/Message.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/msg/Message.o index 9d4c34a..9f0f493 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/msg/Message.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/msg/Message.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/FaustFactory.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/FaustFactory.o index 4ace601..885396a 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/FaustFactory.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/FaustFactory.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/FaustNode.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/FaustNode.o index 78868e3..d5036fb 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/FaustNode.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/FaustNode.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/MessageDriven.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/MessageDriven.o index 100d5df..152c5ba 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/MessageDriven.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/MessageDriven.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/RootNode.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/RootNode.o index 771973d..6d32bee 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/RootNode.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/nodes/RootNode.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCAddress.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCAddress.o index 15087d5..5597339 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCAddress.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCAddress.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCIO.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCIO.o index 4607b0d..91fa7d8 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCIO.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCIO.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCListener.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCListener.o index 1bd5035..814689e 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCListener.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCListener.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCSetup.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCSetup.o index 83bd33a..9fbccf5 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCSetup.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCSetup.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCStream.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCStream.o index 57d09ff..4c05b01 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCStream.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/osc/OSCStream.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/threads/pthreads_impl.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/threads/pthreads_impl.o index e3620b0..d12e15f 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/threads/pthreads_impl.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/threads/pthreads_impl.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/threads/winthreads_impl.o b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/threads/winthreads_impl.o index d1827b9..8601c3c 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/threads/winthreads_impl.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/faust/src/threads/winthreads_impl.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/IpEndpointName.o b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/IpEndpointName.o index a9bee68..c5b4308 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/IpEndpointName.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/IpEndpointName.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/posix/NetworkingUtils.o b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/posix/NetworkingUtils.o index c232532..902e53c 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/posix/NetworkingUtils.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/posix/NetworkingUtils.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/posix/UdpSocket.o b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/posix/UdpSocket.o index af91571..9abe0d2 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/posix/UdpSocket.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/ip/posix/UdpSocket.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscOutboundPacketStream.o b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscOutboundPacketStream.o index aed833d..ee9b16e 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscOutboundPacketStream.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscOutboundPacketStream.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscPrintReceivedElements.o b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscPrintReceivedElements.o index 4f69235..e4e0a92 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscPrintReceivedElements.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscPrintReceivedElements.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscReceivedElements.o b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscReceivedElements.o index 9094461..388cd2d 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscReceivedElements.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscReceivedElements.o differ diff --git a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscTypes.o b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscTypes.o index 784c4aa..e372800 100644 Binary files a/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscTypes.o and b/interpretor/faust-0.9.47mr3/architecture/osclib/oscpack/osc/OscTypes.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/boxes/boxcomplexity.o b/interpretor/faust-0.9.47mr3/compiler/boxes/boxcomplexity.o index 90dbb83..39aba22 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/boxes/boxcomplexity.o and b/interpretor/faust-0.9.47mr3/compiler/boxes/boxcomplexity.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/boxes/boxes.o b/interpretor/faust-0.9.47mr3/compiler/boxes/boxes.o index b69e131..d4e513c 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/boxes/boxes.o and b/interpretor/faust-0.9.47mr3/compiler/boxes/boxes.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/boxes/boxtype.o b/interpretor/faust-0.9.47mr3/compiler/boxes/boxtype.o index 4c54104..2b972e3 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/boxes/boxtype.o and b/interpretor/faust-0.9.47mr3/compiler/boxes/boxtype.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/boxes/ppbox.o b/interpretor/faust-0.9.47mr3/compiler/boxes/ppbox.o index 9b38db3..ba28ecc 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/boxes/ppbox.o and b/interpretor/faust-0.9.47mr3/compiler/boxes/ppbox.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/documentator/doc.o b/interpretor/faust-0.9.47mr3/compiler/documentator/doc.o index 3a59ce4..1046cf5 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/documentator/doc.o and b/interpretor/faust-0.9.47mr3/compiler/documentator/doc.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_Text.o b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_Text.o index c858ccc..8ce7a28 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_Text.o and b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_Text.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_autodoc.o b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_autodoc.o index d7da33e..31c5efd 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_autodoc.o and b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_autodoc.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_compile.o b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_compile.o index 2b9d469..3fd9185 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_compile.o and b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_compile.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_lang.o b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_lang.o index cf05c19..235a31a 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_lang.o and b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_lang.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_metadatas.o b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_metadatas.o index 81be707..9311090 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_metadatas.o and b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_metadatas.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_notice.o b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_notice.o index 1132925..1d0ca14 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_notice.o and b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_notice.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_sharing.o b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_sharing.o index ca351a0..d1141af 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/documentator/doc_sharing.o and b/interpretor/faust-0.9.47mr3/compiler/documentator/doc_sharing.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/documentator/lateq.o b/interpretor/faust-0.9.47mr3/compiler/documentator/lateq.o index a186b97..449bdc4 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/documentator/lateq.o and b/interpretor/faust-0.9.47mr3/compiler/documentator/lateq.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/device/PSDev.o b/interpretor/faust-0.9.47mr3/compiler/draw/device/PSDev.o index d6aa62c..65d50f3 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/device/PSDev.o and b/interpretor/faust-0.9.47mr3/compiler/draw/device/PSDev.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/device/SVGDev.o b/interpretor/faust-0.9.47mr3/compiler/draw/device/SVGDev.o index 8b3fbc7..99b7d96 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/device/SVGDev.o and b/interpretor/faust-0.9.47mr3/compiler/draw/device/SVGDev.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/drawschema.o b/interpretor/faust-0.9.47mr3/compiler/draw/drawschema.o index 87039cc..f098c6d 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/drawschema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/drawschema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/blockSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/blockSchema.o index 24dc11e..ec15573 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/blockSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/blockSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/cableSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/cableSchema.o index 87c5ee7..00c3fb1 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/cableSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/cableSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/collector.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/collector.o index d94e38b..ff0b047 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/collector.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/collector.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/cutSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/cutSchema.o index a7eea3b..17feae5 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/cutSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/cutSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/decorateSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/decorateSchema.o index 3b92cba..8b93414 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/decorateSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/decorateSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/enlargedSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/enlargedSchema.o index adb8770..59694a5 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/enlargedSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/enlargedSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/inverterSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/inverterSchema.o index 57b5db6..9d5732c 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/inverterSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/inverterSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/mergeSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/mergeSchema.o index 2c9e59e..b1bcaf5 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/mergeSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/mergeSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/parSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/parSchema.o index ec2510a..e439d77 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/parSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/parSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/recSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/recSchema.o index 3831b4b..d60f1b3 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/recSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/recSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/seqSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/seqSchema.o index 194798a..5e6edd3 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/seqSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/seqSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/splitSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/splitSchema.o index 7840bdc..5ef9476 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/splitSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/splitSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/schema/topSchema.o b/interpretor/faust-0.9.47mr3/compiler/draw/schema/topSchema.o index a77e65a..74d597f 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/schema/topSchema.o and b/interpretor/faust-0.9.47mr3/compiler/draw/schema/topSchema.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/draw/sigToGraph.o b/interpretor/faust-0.9.47mr3/compiler/draw/sigToGraph.o index e0b1ef8..843e4db 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/draw/sigToGraph.o and b/interpretor/faust-0.9.47mr3/compiler/draw/sigToGraph.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/errors/errormsg.o b/interpretor/faust-0.9.47mr3/compiler/errors/errormsg.o index 73f83aa..9daed93 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/errors/errormsg.o and b/interpretor/faust-0.9.47mr3/compiler/errors/errormsg.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/errors/timing.o b/interpretor/faust-0.9.47mr3/compiler/errors/timing.o index 2cf3816..63983a3 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/errors/timing.o and b/interpretor/faust-0.9.47mr3/compiler/errors/timing.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/evaluate/environment.o b/interpretor/faust-0.9.47mr3/compiler/evaluate/environment.o index 4d2b325..3d8a9ef 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/evaluate/environment.o and b/interpretor/faust-0.9.47mr3/compiler/evaluate/environment.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/evaluate/eval.o b/interpretor/faust-0.9.47mr3/compiler/evaluate/eval.o index 6c23dac..5ed81b4 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/evaluate/eval.o and b/interpretor/faust-0.9.47mr3/compiler/evaluate/eval.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/evaluate/loopDetector.o b/interpretor/faust-0.9.47mr3/compiler/evaluate/loopDetector.o index a1ca106..8888fc8 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/evaluate/loopDetector.o and b/interpretor/faust-0.9.47mr3/compiler/evaluate/loopDetector.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/absprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/absprim.o index fb0e4bf..9dfe6b8 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/absprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/absprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/acosprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/acosprim.o index 9dda95b..fa9013d 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/acosprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/acosprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/asinprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/asinprim.o index 3cbd692..167186a 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/asinprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/asinprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/atan2prim.o b/interpretor/faust-0.9.47mr3/compiler/extended/atan2prim.o index 26717f0..618a14a 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/atan2prim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/atan2prim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/atanprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/atanprim.o index 1706bdc..7501d1c 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/atanprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/atanprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/ceilprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/ceilprim.o index 8bded7b..c80f57a 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/ceilprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/ceilprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/cosprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/cosprim.o index 6008008..29aec00 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/cosprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/cosprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/expprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/expprim.o index 6858209..7173632 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/expprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/expprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/floorprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/floorprim.o index abbbd19..f63b052 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/floorprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/floorprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/fmodprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/fmodprim.o index 2cef067..7b435e2 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/fmodprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/fmodprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/log10prim.o b/interpretor/faust-0.9.47mr3/compiler/extended/log10prim.o index 093124f..7243436 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/log10prim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/log10prim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/logprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/logprim.o index e7c3003..dd4e1ba 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/logprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/logprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/maxprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/maxprim.o index b3c08fc..3ef364a 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/maxprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/maxprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/minprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/minprim.o index 6c1d123..33406a1 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/minprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/minprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/powprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/powprim.o index b81d926..ea59a1c 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/powprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/powprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/remainderprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/remainderprim.o index 3a8ec1e..958b185 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/remainderprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/remainderprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/rintprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/rintprim.o index abe2c56..c5ec5d2 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/rintprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/rintprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/sinprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/sinprim.o index 5114cf4..a8738d1 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/sinprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/sinprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/sqrtprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/sqrtprim.o index fb7b96c..2c5e3b8 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/sqrtprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/sqrtprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/extended/tanprim.o b/interpretor/faust-0.9.47mr3/compiler/extended/tanprim.o index db3c4cf..ccbaf5e 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/extended/tanprim.o and b/interpretor/faust-0.9.47mr3/compiler/extended/tanprim.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/Text.o b/interpretor/faust-0.9.47mr3/compiler/generator/Text.o index f0cd492..02ea2eb 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/Text.o and b/interpretor/faust-0.9.47mr3/compiler/generator/Text.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/compile.o b/interpretor/faust-0.9.47mr3/compiler/generator/compile.o index e609905..392e93d 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/compile.o and b/interpretor/faust-0.9.47mr3/compiler/generator/compile.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/compile_scal.o b/interpretor/faust-0.9.47mr3/compiler/generator/compile_scal.o index 3885362..2a12a2c 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/compile_scal.o and b/interpretor/faust-0.9.47mr3/compiler/generator/compile_scal.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/compile_sched.o b/interpretor/faust-0.9.47mr3/compiler/generator/compile_sched.o index bae028e..14021a3 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/compile_sched.o and b/interpretor/faust-0.9.47mr3/compiler/generator/compile_sched.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/compile_vect.o b/interpretor/faust-0.9.47mr3/compiler/generator/compile_vect.o index e440ef3..aac5204 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/compile_vect.o and b/interpretor/faust-0.9.47mr3/compiler/generator/compile_vect.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/contextor.o b/interpretor/faust-0.9.47mr3/compiler/generator/contextor.o index 3e60143..defc9a4 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/contextor.o and b/interpretor/faust-0.9.47mr3/compiler/generator/contextor.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/description.o b/interpretor/faust-0.9.47mr3/compiler/generator/description.o index 88b26e4..eaf3301 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/description.o and b/interpretor/faust-0.9.47mr3/compiler/generator/description.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/floats.o b/interpretor/faust-0.9.47mr3/compiler/generator/floats.o index 6acb217..8f5b606 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/floats.o and b/interpretor/faust-0.9.47mr3/compiler/generator/floats.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/klass.o b/interpretor/faust-0.9.47mr3/compiler/generator/klass.o index b139289..1523afe 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/klass.o and b/interpretor/faust-0.9.47mr3/compiler/generator/klass.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/occurences.o b/interpretor/faust-0.9.47mr3/compiler/generator/occurences.o index f9e4906..620ba12 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/occurences.o and b/interpretor/faust-0.9.47mr3/compiler/generator/occurences.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/sharing.o b/interpretor/faust-0.9.47mr3/compiler/generator/sharing.o index 0022d9b..4e6c742 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/sharing.o and b/interpretor/faust-0.9.47mr3/compiler/generator/sharing.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/generator/uitree.o b/interpretor/faust-0.9.47mr3/compiler/generator/uitree.o index 3390b3b..6e8e63f 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/generator/uitree.o and b/interpretor/faust-0.9.47mr3/compiler/generator/uitree.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/main.o b/interpretor/faust-0.9.47mr3/compiler/main.o index bb4f648..0cab140 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/main.o and b/interpretor/faust-0.9.47mr3/compiler/main.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/normalize/aterm.o b/interpretor/faust-0.9.47mr3/compiler/normalize/aterm.o index f4ca09b..13db7c8 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/normalize/aterm.o and b/interpretor/faust-0.9.47mr3/compiler/normalize/aterm.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/normalize/mterm.o b/interpretor/faust-0.9.47mr3/compiler/normalize/mterm.o index d471349..5b98102 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/normalize/mterm.o and b/interpretor/faust-0.9.47mr3/compiler/normalize/mterm.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/normalize/normalize.o b/interpretor/faust-0.9.47mr3/compiler/normalize/normalize.o index 77f9fa7..dc1b571 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/normalize/normalize.o and b/interpretor/faust-0.9.47mr3/compiler/normalize/normalize.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/normalize/privatise.o b/interpretor/faust-0.9.47mr3/compiler/normalize/privatise.o index 3cfa541..0dc9c04 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/normalize/privatise.o and b/interpretor/faust-0.9.47mr3/compiler/normalize/privatise.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/normalize/simplify.o b/interpretor/faust-0.9.47mr3/compiler/normalize/simplify.o index d5136dd..6cb2143 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/normalize/simplify.o and b/interpretor/faust-0.9.47mr3/compiler/normalize/simplify.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/parallelize/colorize.o b/interpretor/faust-0.9.47mr3/compiler/parallelize/colorize.o index b453d59..0740fc3 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/parallelize/colorize.o and b/interpretor/faust-0.9.47mr3/compiler/parallelize/colorize.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/parallelize/graphSorting.o b/interpretor/faust-0.9.47mr3/compiler/parallelize/graphSorting.o index 3b48e73..819bb44 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/parallelize/graphSorting.o and b/interpretor/faust-0.9.47mr3/compiler/parallelize/graphSorting.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/parallelize/loop.o b/interpretor/faust-0.9.47mr3/compiler/parallelize/loop.o index fddd27b..95e3739 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/parallelize/loop.o and b/interpretor/faust-0.9.47mr3/compiler/parallelize/loop.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/parser/enrobage.o b/interpretor/faust-0.9.47mr3/compiler/parser/enrobage.o index d4f1d4d..b6c49a2 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/parser/enrobage.o and b/interpretor/faust-0.9.47mr3/compiler/parser/enrobage.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/parser/faustlexer.o b/interpretor/faust-0.9.47mr3/compiler/parser/faustlexer.o index 63cacaf..b1a56a0 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/parser/faustlexer.o and b/interpretor/faust-0.9.47mr3/compiler/parser/faustlexer.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/parser/faustparser.o b/interpretor/faust-0.9.47mr3/compiler/parser/faustparser.o index 164ea64..91414e2 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/parser/faustparser.o and b/interpretor/faust-0.9.47mr3/compiler/parser/faustparser.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/parser/sourcereader.o b/interpretor/faust-0.9.47mr3/compiler/parser/sourcereader.o index ad4cffb..cced8ad 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/parser/sourcereader.o and b/interpretor/faust-0.9.47mr3/compiler/parser/sourcereader.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/patternmatcher/patternmatcher.o b/interpretor/faust-0.9.47mr3/compiler/patternmatcher/patternmatcher.o index d4b2848..089f2aa 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/patternmatcher/patternmatcher.o and b/interpretor/faust-0.9.47mr3/compiler/patternmatcher/patternmatcher.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/propagate/labels.o b/interpretor/faust-0.9.47mr3/compiler/propagate/labels.o index cc533e8..c6d3a50 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/propagate/labels.o and b/interpretor/faust-0.9.47mr3/compiler/propagate/labels.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/propagate/propagate.o b/interpretor/faust-0.9.47mr3/compiler/propagate/propagate.o index 76451e6..f3a6877 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/propagate/propagate.o and b/interpretor/faust-0.9.47mr3/compiler/propagate/propagate.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/binop.o b/interpretor/faust-0.9.47mr3/compiler/signals/binop.o index 30d1d3c..807f70e 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/binop.o and b/interpretor/faust-0.9.47mr3/compiler/signals/binop.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/ppsig.o b/interpretor/faust-0.9.47mr3/compiler/signals/ppsig.o index 0824c2b..2097b74 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/ppsig.o and b/interpretor/faust-0.9.47mr3/compiler/signals/ppsig.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/prim2.o b/interpretor/faust-0.9.47mr3/compiler/signals/prim2.o index f044da0..03da70f 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/prim2.o and b/interpretor/faust-0.9.47mr3/compiler/signals/prim2.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/recursivness.o b/interpretor/faust-0.9.47mr3/compiler/signals/recursivness.o index d095f7a..7192e5a 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/recursivness.o and b/interpretor/faust-0.9.47mr3/compiler/signals/recursivness.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/signals.o b/interpretor/faust-0.9.47mr3/compiler/signals/signals.o index 83a38e8..a69f04f 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/signals.o and b/interpretor/faust-0.9.47mr3/compiler/signals/signals.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/sigorderrules.o b/interpretor/faust-0.9.47mr3/compiler/signals/sigorderrules.o index aed79c9..cb077db 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/sigorderrules.o and b/interpretor/faust-0.9.47mr3/compiler/signals/sigorderrules.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/sigprint.o b/interpretor/faust-0.9.47mr3/compiler/signals/sigprint.o index 490b79d..2b8209e 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/sigprint.o and b/interpretor/faust-0.9.47mr3/compiler/signals/sigprint.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/sigraterules.o b/interpretor/faust-0.9.47mr3/compiler/signals/sigraterules.o index 18200d2..441e615 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/sigraterules.o and b/interpretor/faust-0.9.47mr3/compiler/signals/sigraterules.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/sigtype.o b/interpretor/faust-0.9.47mr3/compiler/signals/sigtype.o index 4501b78..09d1708 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/sigtype.o and b/interpretor/faust-0.9.47mr3/compiler/signals/sigtype.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/sigtyperules.o b/interpretor/faust-0.9.47mr3/compiler/signals/sigtyperules.o index c59a5ef..5a488b9 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/sigtyperules.o and b/interpretor/faust-0.9.47mr3/compiler/signals/sigtyperules.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/sigvisitor.o b/interpretor/faust-0.9.47mr3/compiler/signals/sigvisitor.o index 38ab0a4..eb4671c 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/sigvisitor.o and b/interpretor/faust-0.9.47mr3/compiler/signals/sigvisitor.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/signals/subsignals.o b/interpretor/faust-0.9.47mr3/compiler/signals/subsignals.o index 7613c31..092aa09 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/signals/subsignals.o and b/interpretor/faust-0.9.47mr3/compiler/signals/subsignals.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/tlib/compatibility.o b/interpretor/faust-0.9.47mr3/compiler/tlib/compatibility.o index db769ff..b9e68f4 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/tlib/compatibility.o and b/interpretor/faust-0.9.47mr3/compiler/tlib/compatibility.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/tlib/list.o b/interpretor/faust-0.9.47mr3/compiler/tlib/list.o index 98d3fd2..c37a571 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/tlib/list.o and b/interpretor/faust-0.9.47mr3/compiler/tlib/list.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/tlib/node.o b/interpretor/faust-0.9.47mr3/compiler/tlib/node.o index e2bd1cc..15fb64a 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/tlib/node.o and b/interpretor/faust-0.9.47mr3/compiler/tlib/node.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/tlib/occurrences.o b/interpretor/faust-0.9.47mr3/compiler/tlib/occurrences.o index e99b89e..56062fc 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/tlib/occurrences.o and b/interpretor/faust-0.9.47mr3/compiler/tlib/occurrences.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/tlib/recursive-tree.o b/interpretor/faust-0.9.47mr3/compiler/tlib/recursive-tree.o index 66cc011..fa9144e 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/tlib/recursive-tree.o and b/interpretor/faust-0.9.47mr3/compiler/tlib/recursive-tree.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/tlib/shlysis.o b/interpretor/faust-0.9.47mr3/compiler/tlib/shlysis.o index 8190c4d..98fb184 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/tlib/shlysis.o and b/interpretor/faust-0.9.47mr3/compiler/tlib/shlysis.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/tlib/symbol.o b/interpretor/faust-0.9.47mr3/compiler/tlib/symbol.o index e92ca71..ba86a6d 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/tlib/symbol.o and b/interpretor/faust-0.9.47mr3/compiler/tlib/symbol.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/tlib/tree.o b/interpretor/faust-0.9.47mr3/compiler/tlib/tree.o index c6954a7..13b32cb 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/tlib/tree.o and b/interpretor/faust-0.9.47mr3/compiler/tlib/tree.o differ diff --git a/interpretor/faust-0.9.47mr3/compiler/utils/names.o b/interpretor/faust-0.9.47mr3/compiler/utils/names.o index b3b6197..37302d1 100644 Binary files a/interpretor/faust-0.9.47mr3/compiler/utils/names.o and b/interpretor/faust-0.9.47mr3/compiler/utils/names.o differ diff --git a/interpretor/lexer.mll b/interpretor/lexer.mll index 1c427a9..3cb9847 100644 --- a/interpretor/lexer.mll +++ b/interpretor/lexer.mll @@ -29,6 +29,8 @@ rule token = parse | "serialize" { IDENT Serialize} | ">" { IDENT Larger} | "<" { IDENT Smaller} +| "max" { IDENT Max} +| "min" { IDENT Min} | "prefix" { IDENT Prefix} | "selecttwo" { IDENT Select2} | "selectthree" { IDENT Select3} diff --git a/interpretor/process.ml b/interpretor/process.ml index 31cc6c9..e7568df 100644 --- a/interpretor/process.ml +++ b/interpretor/process.ml @@ -164,6 +164,10 @@ class proc_ident : faust_exp -> process_type = ((input#get.(0))#larger input#get.(1)) | Smaller -> self#beam_of_ident n ((input#get.(0))#smaller input#get.(1)) + | Max -> self#beam_of_ident n + ((input#get.(0))#max input#get.(1)) + | Min -> self#beam_of_ident n + ((input#get.(0))#min input#get.(1)) | Prefix -> self#beam_of_ident n ((input#get.(1))#prefix input#get.(0)) | Select2 -> self#beam_of_ident n diff --git a/interpretor/signal.ml b/interpretor/signal.ml index 2dd9f73..a32923e 100644 --- a/interpretor/signal.ml +++ b/interpretor/signal.ml @@ -90,6 +90,8 @@ class signal : int -> (time -> value_type) -> signal_type = method _mod = self#prim2 (fun t -> (self#at t)#_mod) method larger = self#prim2 (fun t -> (self#at t)#larger) method smaller = self#prim2 (fun t -> (self#at t)#smaller) + method max = self#prim2 (fun t -> (self#at t)#max) + method min = self#prim2 (fun t -> (self#at t)#min) method delay : signal_type -> signal_type = fun (s : signal_type) -> diff --git a/interpretor/symbol.ml b/interpretor/symbol.ml index a37f1d3..bdfa410 100644 --- a/interpretor/symbol.ml +++ b/interpretor/symbol.ml @@ -40,6 +40,8 @@ let dimension_of_symbol : symbol -> int * int = |Serialize -> (1, 1) |Larger -> (2, 1) |Smaller -> (2, 1) + |Max -> (2, 1) + |Min -> (2, 1) |Prefix -> (2, 1) |Select2 -> (3, 1) |Select3 -> (4, 1);; @@ -66,6 +68,8 @@ let delay_of_symbol : symbol -> int = |Mod -> 0 |Larger -> 0 |Smaller -> 0 + |Max -> 0 + |Min -> 0 |Vectorize -> vectorize_memory_length |Vconcat -> 0 |Vpick -> 0 @@ -96,6 +100,8 @@ let string_of_symbol : symbol -> string = |Mod -> "Mod" |Larger -> "Larger" |Smaller -> "Smaller" + |Max -> "Max" + |Min -> "Min" |Vectorize -> "Vectorize" |Vconcat -> "Vconcat" |Vpick -> "Vpick" diff --git a/interpretor/types.ml b/interpretor/types.ml index dae188f..352afbe 100644 --- a/interpretor/types.ml +++ b/interpretor/types.ml @@ -42,6 +42,8 @@ class type value_type = method _mod : value_type -> value_type method larger : value_type -> value_type method smaller : value_type -> value_type + method max : value_type -> value_type + method min : value_type -> value_type end;; @@ -68,6 +70,8 @@ type symbol = Add | Serialize | Larger | Smaller + | Max + | Min | Prefix | Select2 | Select3 @@ -109,6 +113,8 @@ class type signal_type = method _mod : signal_type -> signal_type method larger : signal_type -> signal_type method smaller : signal_type -> signal_type + method max : signal_type -> signal_type + method min : signal_type -> signal_type method rdtable : signal_type -> signal_type -> signal_type method select2 : signal_type -> signal_type -> signal_type method select3 : signal_type -> signal_type -> signal_type -> signal_type diff --git a/interpretor/value.ml b/interpretor/value.ml index 3c97aa0..ef05f43 100644 --- a/interpretor/value.ml +++ b/interpretor/value.ml @@ -52,6 +52,8 @@ class value : basic -> value_type = method _mod = self#prim2 basic_mod method larger = self#prim2 basic_larger method smaller = self#prim2 basic_smaller + method max = self#prim2 basic_max + method min = self#prim2 basic_min end;; diff --git a/output_sounds/output0.wav b/output_sounds/output0.wav deleted file mode 100644 index b815a38..0000000 Binary files a/output_sounds/output0.wav and /dev/null differ